diff --git a/.env.development b/.env.development
index f2301ee..a61ffc3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 苦糖果MES-软件开发记录
+VUE_APP_TITLE = 智造大师
 
 # 开发环境配置
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/prod-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index 93172c2..63b8337 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 苦糖果MES-软件开发记录
+VUE_APP_TITLE = 智造大师
 
 # 生产环境配置
 ENV = 'production'
diff --git a/.env.staging b/.env.staging
index 12ce6a0..525bf3a 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 苦糖果MES-软件开发记录
+VUE_APP_TITLE = 智造大师
 
 NODE_ENV = production
 
diff --git a/.gitignore b/.gitignore
index 03d9869..253e46d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,9 +18,9 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
-.editorconfig
-.eslintignore
-.eslintrc.js
-.env.*
+# .editorconfig
+# .eslintignore
+# .eslintrc.js
+# .env.*
 package-lock.json
 yarn.lock
diff --git a/package.json b/package.json
index fd08a43..b71fac5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ktg-mes-ui",
   "version": "3.8.2",
-  "description": "苦糖果MES",
+  "description": "智造大师",
   "author": "YinJinLu",
   "license": "MIT",
   "scripts": {
@@ -44,9 +44,12 @@
     "dhtmlx-gantt": "^7.1.11",
     "echarts": "4.9.0",
     "element-ui": "2.15.6",
+    "ezuikit-js": "^0.7.2",
     "file-saver": "2.0.5",
+    "flv.js": "^1.6.2",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
+    "jquery": "^3.7.1",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
diff --git a/public/favicon.ico b/public/favicon.ico
index 8e03fd4..a58c261 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/index.html b/public/index.html
index 925455c..6f7abbb 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
+    <title>智造大师</title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
     html,
diff --git a/src/App.vue b/src/App.vue
index 391d951..5649a73 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,13 +7,13 @@
 <script>
 export default  {
   name:  'App',
-    metaInfo() {
-        return {
-            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-            titleTemplate: title => {
-                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-            }
-        }
-    }
+    // metaInfo() {
+    //     return {
+    //         title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
+    //         titleTemplate: title => {
+    //             return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
+    //         }
+    //     }
+    // }
 }
 </script>
diff --git a/src/api/abnormalityAlarm/machineTool.js b/src/api/abnormalityAlarm/machineTool.js
new file mode 100644
index 0000000..c72c1bd
--- /dev/null
+++ b/src/api/abnormalityAlarm/machineTool.js
@@ -0,0 +1,19 @@
+import request from "@/utils/request";
+
+// 查询设备报警列表
+export function list(query) {
+  return request({
+    url: "/cad/warn/page",
+    method: "get",
+    params: query,
+  });
+}
+
+// 修改设备报警
+export function edit(data) {
+  return request({
+    url: "/cad/warn/edit",
+    method: "put",
+    data: data,
+  });
+}
diff --git a/src/api/management/codeprogram.js b/src/api/management/codeprogram.js
new file mode 100644
index 0000000..e0d44d8
--- /dev/null
+++ b/src/api/management/codeprogram.js
@@ -0,0 +1,45 @@
+import request from "@/utils/request";
+
+// 查询排班列表
+export function list(query) {
+  return request({
+    url: "/cad/code/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 新增
+export function updateTeam(data) {
+  return request({
+    url: "/cad/code/add",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改
+export function reviseFile(data) {
+  return request({
+    url: "/cad/code/edit",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除
+export function delTeam(teamId) {
+  return request({
+    url: "/cad/code/" + teamId,
+    method: "delete",
+  });
+}
+
+// 查询设备列表
+export function listMachinery(query) {
+  return request({
+    url: "/mes/dv/machinery/list",
+    method: "get",
+    params: query,
+  });
+}
diff --git a/src/api/management/document.js b/src/api/management/document.js
new file mode 100644
index 0000000..655b820
--- /dev/null
+++ b/src/api/management/document.js
@@ -0,0 +1,45 @@
+import request from "@/utils/request";
+
+// 查询排班列表
+export function list(query) {
+  return request({
+    url: "/cad/file/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 新增
+export function updateTeam(data) {
+  return request({
+    url: "/cad/file",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改
+export function reviseFile(data) {
+  return request({
+    url: "/cad/file",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除
+export function delTeam(teamId) {
+  return request({
+    url: "/cad/file/" + teamId,
+    method: "delete",
+  });
+}
+
+// 查询文件类型列表
+export function listType(query) {
+  return request({
+    url: "/cad/type/list",
+    method: "get",
+    params: query,
+  });
+}
diff --git a/src/api/management/documentType.js b/src/api/management/documentType.js
new file mode 100644
index 0000000..bb0c6aa
--- /dev/null
+++ b/src/api/management/documentType.js
@@ -0,0 +1,36 @@
+import request from "@/utils/request";
+
+// 查询排班列表
+export function list(query) {
+  return request({
+    url: "/cad/type/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 新增
+export function updateTeam(data) {
+  return request({
+    url: "/cad/type",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改
+export function reviseFile(data) {
+  return request({
+    url: "/cad/type",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除
+export function delTeam(teamId) {
+  return request({
+    url: "/cad/type/" + teamId,
+    method: "delete",
+  });
+}
diff --git a/src/api/mes/dv/machinery.js b/src/api/mes/dv/machinery.js
index 84f56a3..7c5c0cf 100644
--- a/src/api/mes/dv/machinery.js
+++ b/src/api/mes/dv/machinery.js
@@ -1,44 +1,71 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询设备列表
 export function listMachinery(query) {
   return request({
-    url: '/mes/dv/machinery/list',
-    method: 'get',
-    params: query
-  })
+    url: "/mes/dv/machinery/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询设备详细
 export function getMachinery(machineryId) {
   return request({
-    url: '/mes/dv/machinery/' + machineryId,
-    method: 'get'
-  })
+    url: "/mes/dv/machinery/" + machineryId,
+    method: "get",
+  });
+}
+
+// 查询代码程序列表
+export function listMes(query) {
+  return request({
+    url: "/cad/code/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 新增设备
 export function addMachinery(data) {
   return request({
-    url: '/mes/dv/machinery',
-    method: 'post',
-    data: data
-  })
+    url: "/mes/dv/machinery",
+    method: "post",
+    data: data,
+  });
 }
 
 // 修改设备
 export function updateMachinery(data) {
   return request({
-    url: '/mes/dv/machinery',
-    method: 'put',
-    data: data
-  })
+    url: "/mes/dv/machinery",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除设备
 export function delMachinery(machineryId) {
   return request({
-    url: '/mes/dv/machinery/' + machineryId,
-    method: 'delete'
-  })
+    url: "/mes/dv/machinery/" + machineryId,
+    method: "delete",
+  });
+}
+
+// 新增设备关联通知人
+export function UserArr(data) {
+  return request({
+    url: "/machinery/User/add",
+    method: "post",
+    data: data,
+  });
+}
+
+// 查询设备关联通知人详细信息
+export function machineryUsers(query) {
+  return request({
+    url: "/machinery/User/machineryUsers",
+    method: "get",
+    params: query,
+  });
 }
diff --git a/src/api/mes/dv/route.js b/src/api/mes/dv/route.js
new file mode 100644
index 0000000..40cd9fb
--- /dev/null
+++ b/src/api/mes/dv/route.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询agv线路
+export function findProAgvline(query) {
+  return request({
+    url: '/proagv/findProAgvline',
+    method: 'get',
+    params: query
+  })
+}
+
+// 自动生成agv线路编码
+export function findLineCode(query) {
+    return request({
+      url: '/proagv/findLineCode',
+      method: 'get',
+      params: query
+    })
+  }
+
+// 新增agv线路
+export function addProAgvline(data) {
+  return request({
+    url: '/proagv/addProAgvline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改agv线路
+export function updateProAgvline(data) {
+    return request({
+      url: '/proagv/updateProAgvline',
+      method: 'post',
+      data: data
+    })
+  }
+
+  // 删除agv线路
+export function deleteProAgvline(data) {
+    return request({
+      url: '/proagv/deleteProAgvline',
+      method: 'post',
+      data: data
+    })
+  }
\ No newline at end of file
diff --git a/src/api/mes/dv/siteConfiguration.js b/src/api/mes/dv/siteConfiguration.js
new file mode 100644
index 0000000..14b772e
--- /dev/null
+++ b/src/api/mes/dv/siteConfiguration.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询agv站点
+export function findProAgvsite(query) {
+  return request({
+    url: '/proagvsite/findProAgvsite',
+    method: 'get',
+    params: query
+  })
+}
+
+// 自动生成agv站点编码
+export function findSiteCode(query) {
+    return request({
+      url: '/proagvsite/findSiteCode',
+      method: 'get',
+      params: query
+    })
+  }
+
+// 新增agv站点
+export function addProAgvsite(data) {
+  return request({
+    url: '/proagvsite/addProAgvsite',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改agv线路
+export function updateProAgvsite(data) {
+    return request({
+      url: '/proagvsite/updateProAgvsite',
+      method: 'post',
+      data: data
+    })
+  }
+
+  // 删除agv站点
+export function deleteProAgvsite(data) {
+    return request({
+      url: '/proagvsite/deleteProAgvsite',
+      method: 'post',
+      data: data
+    })
+  }
\ No newline at end of file
diff --git a/src/api/mes/md/pallet.js b/src/api/mes/md/pallet.js
new file mode 100644
index 0000000..9baa8dd
--- /dev/null
+++ b/src/api/mes/md/pallet.js
@@ -0,0 +1,64 @@
+import request from "@/utils/request";
+
+// 分页查询托盘设置列表
+export function listMdItem(query) {
+  return request({
+    url: "/propallet/findProPallet",
+    method: "get",
+    params: query,
+  });
+}
+
+// 新增托盘设置
+export function addMdItem(data) {
+  return request({
+    url: "/propallet/addProPallet",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改托盘设置
+export function updateMdItem(data) {
+  return request({
+    url: "/propallet/updateProPallet",
+    method: "post",
+    data: data,
+  });
+}
+
+// 删除托盘设置
+export function delMdItem(data) {
+  return request({
+    url: "/propallet/deleteProPallet",
+    method: "post",
+    data: data,
+  });
+}
+
+// 批量删除托盘设置
+export function batchDeleteProPallet(itemId) {
+  return request({
+    url: "/propallet/batchDeleteProPallet" + "?proPalletIds=" + itemId,
+    method: "get",
+  });
+}
+
+// 自动生成托盘编码
+export function findPalletCode(query) {
+  return request({
+    url: "/propallet/findPalletCode",
+    method: "get",
+    params: query,
+  });
+}
+
+// 托盘设置导出
+export function exportProPallet(query) {
+  return request({
+    url: "/propallet/exportProPallet",
+    method: "get",
+    params: query,
+  });
+}
+
diff --git a/src/api/mes/pro/processType.js b/src/api/mes/pro/processType.js
new file mode 100644
index 0000000..317298b
--- /dev/null
+++ b/src/api/mes/pro/processType.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询工序类型列表
+export function listMachinerytype(query) {
+  return request({
+    url: '/process/type/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工序类型详细
+export function getMachinerytype(processTypeld) {
+  return request({
+    url: '/process/type/' + processTypeld,
+    method: 'get'
+  })
+}
+
+// 新增工序类型
+export function addMachinerytype(data) {
+  return request({
+    url: '/process/type/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工序类型
+export function updateMachinerytype(data) {
+  return request({
+    url: '/process/type/edit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工序类型
+export function delMachinerytype(processTypeld) {
+  return request({
+    url: '/process/type/' + processTypeld,
+    method: 'delete'
+  })
+}
diff --git a/src/api/mes/pro/proroute.js b/src/api/mes/pro/proroute.js
index d587e25..19af2af 100644
--- a/src/api/mes/pro/proroute.js
+++ b/src/api/mes/pro/proroute.js
@@ -42,3 +42,11 @@ export function delProroute(routeId) {
     method: 'delete'
   })
 }
+
+// 复制
+export function copyProRoute(routeId) {
+  return request({
+    url: '/mes/pro/proroute/copyProRoute/' + routeId,
+    method: 'get'
+  })
+}
diff --git a/src/api/mes/pro/routeprocess.js b/src/api/mes/pro/routeprocess.js
index efec2e7..c47a4b2 100644
--- a/src/api/mes/pro/routeprocess.js
+++ b/src/api/mes/pro/routeprocess.js
@@ -9,6 +9,13 @@ export function listRouteprocess(query) {
   })
 }
 
+export function listRouteprocessTwo(query) {
+  return request({
+    url: '/mes/pro/routeprocess/processesList',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询产品的工艺组成列表
 export function listProductprocess(productId) {
diff --git a/src/api/mes/pro/workorder.js b/src/api/mes/pro/workorder.js
index 4ad8dd0..a9405cf 100644
--- a/src/api/mes/pro/workorder.js
+++ b/src/api/mes/pro/workorder.js
@@ -61,9 +61,11 @@ export function listItems(query) {
   })
 }
 
-export function dofinish(workorderId){
+// 删除
+export function deleteShopFace(data) {
   return request({
-    url: '/mes/pro/workorder/'+workorderId,
-    method: 'put'
+    url: '/mes/pro/workorder/deleteShopFace',
+    method: 'post',
+    data: data
   })
 }
\ No newline at end of file
diff --git a/src/api/mes/wm/itemrecpt.js b/src/api/mes/wm/itemrecpt.js
index 4e0bf92..19700ca 100644
--- a/src/api/mes/wm/itemrecpt.js
+++ b/src/api/mes/wm/itemrecpt.js
@@ -45,10 +45,11 @@ export function confirmItemrecpt(data) {
 }
 
 //执行入库
-export function execute(recptId) {
+export function storage(data) {
   return request({
-    url: '/mes/wm/itemrecpt/' + recptId,
-    method: 'put'
+    url: '/wmMatter/storage',
+    method: 'post',
+    data: data
   })
 }
 
diff --git a/src/api/ownerContract.js b/src/api/ownerContract.js
new file mode 100644
index 0000000..cd06efa
--- /dev/null
+++ b/src/api/ownerContract.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 机构合同基本信息新增
+export function addOwnerContBase(data) {
+  return request({
+    url: `/owner/contract/addOwnerContBase`,
+    method: 'post',
+    data
+  })
+}
+
+// 机构合同基本信息修改
+export function modifyOwnerContBaseById(data) {
+  return request({
+    url: `/updateOrganInfo`,
+    method: 'post',
+    data
+  })
+}
+
+// 根据ID查看合同基本信息详情
+export function findOwnById(id) {
+  return request({
+    url: `/owner/contract/findById/${id}`,
+    method: 'get'
+  })
+}
+
+// 根据ID查看合同基本信息详情
+export function findByOrganId(organId) {
+  return request({
+    url: `/owner/contract/findByOrganId/${organId}`,
+    method: 'get'
+  })
+}
+
+// 获取登录用户机构信息
+export function getOrganInfo(params) {
+  return request({
+    url: `/getOrganInfo`,
+    method: 'get',
+    params
+  })
+}
+
+export function updateLogoImg(params) {
+  return request({
+    url: ``,
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 4b455e1..1744cb7 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -108,4 +108,13 @@ export function authUserSelectAll(data) {
     method: 'put',
     params: data
   })
+}
+
+// 角色恢复默认菜单权限
+export function resetRole(query) {
+  return request({
+    url: '/system/role/resetRole',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/assets/font/Ayuthaya.ttf b/src/assets/font/Ayuthaya.ttf
new file mode 100644
index 0000000..e051e29
Binary files /dev/null and b/src/assets/font/Ayuthaya.ttf differ
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
new file mode 100644
index 0000000..5e2aaca
--- /dev/null
+++ b/src/assets/font/font.css
@@ -0,0 +1,7 @@
+/* // 这是 font.css 可设置多种字体； */
+/* // 注意：font-family: 'XXX'; 将字体名字自定义为 XXX,使用时要用这个名字 */
+
+@font-face {
+  font-family: 'Ayuthaya';
+  src: url('./Ayuthaya.ttf');
+}
\ No newline at end of file
diff --git a/src/assets/images/biaotixiugai.png b/src/assets/images/biaotixiugai.png
new file mode 100644
index 0000000..01fe571
Binary files /dev/null and b/src/assets/images/biaotixiugai.png differ
diff --git a/src/assets/images/close.png b/src/assets/images/close.png
new file mode 100644
index 0000000..0230a0a
Binary files /dev/null and b/src/assets/images/close.png differ
diff --git a/src/assets/images/emergencyStop.png b/src/assets/images/emergencyStop.png
new file mode 100644
index 0000000..8b5f452
Binary files /dev/null and b/src/assets/images/emergencyStop.png differ
diff --git a/src/assets/images/fuwei-02.png b/src/assets/images/fuwei-02.png
new file mode 100644
index 0000000..90d3be8
Binary files /dev/null and b/src/assets/images/fuwei-02.png differ
diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg
index 8a89eb8..de0ef28 100644
Binary files a/src/assets/images/login-background.jpg and b/src/assets/images/login-background.jpg differ
diff --git a/src/assets/images/login_bg.jpg b/src/assets/images/login_bg.jpg
new file mode 100644
index 0000000..5fbda7d
Binary files /dev/null and b/src/assets/images/login_bg.jpg differ
diff --git a/src/assets/images/login_title.png b/src/assets/images/login_title.png
new file mode 100644
index 0000000..ac0de12
Binary files /dev/null and b/src/assets/images/login_title.png differ
diff --git a/src/assets/images/logo-b.png b/src/assets/images/logo-b.png
new file mode 100644
index 0000000..34438bf
Binary files /dev/null and b/src/assets/images/logo-b.png differ
diff --git a/src/assets/images/logo-b1.png b/src/assets/images/logo-b1.png
new file mode 100644
index 0000000..57ce112
Binary files /dev/null and b/src/assets/images/logo-b1.png differ
diff --git a/src/assets/images/logo-small.png b/src/assets/images/logo-small.png
new file mode 100644
index 0000000..a2a8566
Binary files /dev/null and b/src/assets/images/logo-small.png differ
diff --git a/src/assets/images/logo-small1.png b/src/assets/images/logo-small1.png
new file mode 100644
index 0000000..ab080eb
Binary files /dev/null and b/src/assets/images/logo-small1.png differ
diff --git a/src/assets/images/logo_white.png b/src/assets/images/logo_white.png
new file mode 100644
index 0000000..c150328
Binary files /dev/null and b/src/assets/images/logo_white.png differ
diff --git a/src/assets/images/machine.png b/src/assets/images/machine.png
new file mode 100644
index 0000000..3574e3a
Binary files /dev/null and b/src/assets/images/machine.png differ
diff --git a/src/assets/images/open.png b/src/assets/images/open.png
new file mode 100644
index 0000000..acf6e2d
Binary files /dev/null and b/src/assets/images/open.png differ
diff --git a/src/assets/images/return.png b/src/assets/images/return.png
new file mode 100644
index 0000000..5ebfb56
Binary files /dev/null and b/src/assets/images/return.png differ
diff --git a/src/assets/images/robotic.png b/src/assets/images/robotic.png
new file mode 100644
index 0000000..4fbbb3d
Binary files /dev/null and b/src/assets/images/robotic.png differ
diff --git a/src/assets/images/scjk.png b/src/assets/images/scjk.png
new file mode 100644
index 0000000..36e3333
Binary files /dev/null and b/src/assets/images/scjk.png differ
diff --git a/src/assets/images/shangdian.png b/src/assets/images/shangdian.png
new file mode 100644
index 0000000..70f4e24
Binary files /dev/null and b/src/assets/images/shangdian.png differ
diff --git a/src/assets/images/shoujitianchong.png b/src/assets/images/shoujitianchong.png
new file mode 100644
index 0000000..ab1a4a4
Binary files /dev/null and b/src/assets/images/shoujitianchong.png differ
diff --git a/src/assets/images/weishangdian.png b/src/assets/images/weishangdian.png
new file mode 100644
index 0000000..46de754
Binary files /dev/null and b/src/assets/images/weishangdian.png differ
diff --git a/src/assets/images/zhubeijing.png b/src/assets/images/zhubeijing.png
new file mode 100644
index 0000000..7a19dce
Binary files /dev/null and b/src/assets/images/zhubeijing.png differ
diff --git a/src/assets/logo/favicon.png b/src/assets/logo/favicon.png
new file mode 100644
index 0000000..a58c261
Binary files /dev/null and b/src/assets/logo/favicon.png differ
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index ed308b8..9db8b1e 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,18 +1,17 @@
 #app {
-
   .main-container {
     min-height: 100%;
-    transition: margin-left .28s;
+    transition: margin-left 0.28s;
     margin-left: $base-sidebar-width;
     position: relative;
   }
 
   .sidebarHide {
-    margin-left: 0!important;
+    margin-left: 0 !important;
   }
 
   .sidebar-container {
-    -webkit-transition: width .28s;
+    -webkit-transition: width 0.28s;
     transition: width 0.28s;
     width: $base-sidebar-width !important;
     background-color: $base-menu-background;
@@ -24,12 +23,15 @@
     left: 0;
     z-index: 1001;
     overflow: hidden;
-    -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
+    box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
 
     // reset element-ui css
     .horizontal-collapse-transition {
-      transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+      transition:
+        0s width ease-in-out,
+        0s padding-left ease-in-out,
+        0s padding-right ease-in-out;
     }
 
     .scrollbar-wrapper {
@@ -70,7 +72,8 @@
       width: 100% !important;
     }
 
-    .el-menu-item, .el-submenu__title {
+    .el-menu-item,
+    .el-submenu__title {
       overflow: hidden !important;
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
@@ -80,7 +83,7 @@
     .submenu-title-noDropdown,
     .el-submenu__title {
       &:hover {
-        background-color: rgba(0, 0, 0, 0.06) !important;
+        background-color: #f9f9f9 !important;
       }
     }
 
@@ -88,7 +91,7 @@
       color: $base-menu-color-active !important;
     }
 
-    & .nest-menu .el-submenu>.el-submenu__title,
+    & .nest-menu .el-submenu > .el-submenu__title,
     & .el-submenu .el-menu-item {
       min-width: $base-sidebar-width !important;
 
@@ -97,7 +100,7 @@
       }
     }
 
-    & .theme-dark .nest-menu .el-submenu>.el-submenu__title,
+    & .theme-dark .nest-menu .el-submenu > .el-submenu__title,
     & .theme-dark .el-submenu .el-menu-item {
       background-color: $base-sub-menu-background !important;
 
@@ -132,20 +135,19 @@
     .el-submenu {
       overflow: hidden;
 
-      &>.el-submenu__title {
+      & > .el-submenu__title {
         padding: 0 !important;
 
         .svg-icon {
           margin-left: 20px;
         }
-
       }
     }
 
     .el-menu--collapse {
       .el-submenu {
-        &>.el-submenu__title {
-          &>span {
+        & > .el-submenu__title {
+          & > span {
             height: 0;
             width: 0;
             overflow: hidden;
@@ -168,7 +170,7 @@
     }
 
     .sidebar-container {
-      transition: transform .28s;
+      transition: transform 0.28s;
       width: $base-sidebar-width !important;
     }
 
@@ -182,7 +184,6 @@
   }
 
   .withoutAnimation {
-
     .main-container,
     .sidebar-container {
       transition: none;
@@ -192,13 +193,13 @@
 
 // when menu collapsed
 .el-menu--vertical {
-  &>.el-menu {
+  & > .el-menu {
     .svg-icon {
       margin-right: 16px;
     }
   }
 
-  .nest-menu .el-submenu>.el-submenu__title,
+  .nest-menu .el-submenu > .el-submenu__title,
   .el-menu-item {
     &:hover {
       // you can use $subMenuHover
@@ -207,7 +208,7 @@
   }
 
   // the scroll bar appears when the subMenu is too long
-  >.el-menu--popup {
+  > .el-menu--popup {
     max-height: 100vh;
     overflow-y: auto;
 
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 34484d4..052b371 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -1,25 +1,25 @@
 // base color
-$blue:#324157;
-$light-blue:#3A71A8;
-$red:#C03639;
-$pink: #E65D6E;
-$green: #30B08F;
-$tiffany: #4AB7BD;
-$yellow:#FEC171;
-$panGreen: #30B08F;
+$blue: #324157;
+$light-blue: #3a71a8;
+$red: #c03639;
+$pink: #e65d6e;
+$green: #30b08f;
+$tiffany: #4ab7bd;
+$yellow: #fec171;
+$panGreen: #30b08f;
 
 // 默认菜单主题风格
-$base-menu-color:#bfcbd9;
-$base-menu-color-active:#f4f4f5;
-$base-menu-background:#304156;
-$base-logo-title-color: #ffffff;
+$base-menu-color: #001529;
+$base-menu-color-active: #409eff;
+$base-menu-background: #fff;
+$base-logo-title-color: #001529;
 
-$base-menu-light-color:rgba(0,0,0,.70);
-$base-menu-light-background:#ffffff;
+$base-menu-light-color: #001529;
+$base-menu-light-background: #ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background:#1f2d3d;
-$base-sub-menu-hover:#001528;
+$base-sub-menu-background: #f3f2f2;
+$base-sub-menu-hover: #ecf3fc;
 
 // 自定义暗色菜单风格
 /**
@@ -50,5 +50,5 @@ $base-sidebar-width: 200px;
   subMenuHover: $base-sub-menu-hover;
   sideBarWidth: $base-sidebar-width;
   logoTitleColor: $base-logo-title-color;
-  logoLightTitleColor: $base-logo-light-title-color
+  logoLightTitleColor: $base-logo-light-title-color;
 }
diff --git a/src/components/Footer/index.vue b/src/components/Footer/index.vue
new file mode 100644
index 0000000..1bc3101
--- /dev/null
+++ b/src/components/Footer/index.vue
@@ -0,0 +1,316 @@
+<template>
+  <!--导航栏页-->
+  <div class="footer">
+    <div class="footer_right">
+      <a class="it" href="https://beian.miit.gov.cn" target="_blank"
+        >苏ICP备2021009988号-6
+      </a>
+    </div>
+    <!--  -->
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Nav",
+  data() {
+    return {
+      // isCollapse:true
+    };
+  },
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.footer {
+  background: rgba(0, 0, 0, 0.6);
+  position: fixed;
+  height: 5%;
+  bottom: 0;
+  width: 100%;
+  margin-bottom: 0px;
+  justify-content: space-between;
+  .foot_content {
+    padding-left: 11.5%;
+    padding-right: 11.5%;
+    height: 360px;
+    color: #fff;
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 77%;
+
+    // div {
+    //   height: 200px;
+    //   width: 30%;
+    // }
+    .about_us {
+      height: 200px;
+      width: 30%;
+
+      .title {
+        height: 0.8rem;
+        font-size: 0.327rem;
+      }
+      .border {
+        height: 2px;
+        display: flex;
+        justify-content: flex-start;
+        .red {
+          border-bottom: 2px solid #00a0dc;
+          width: 64px;
+          height: 100%;
+        }
+        .gray {
+          border-bottom: 1px solid #707070;
+          // width: 308px;
+          flex: 1;
+          height: 100%;
+        }
+      }
+      .info {
+        margin-top: 0.39rem;
+        opacity: 0.7;
+        font-size: 0.218rem;
+        line-height: 0.51rem;
+        padding-left: 0.2rem;
+        padding-right: 0.2rem;
+      }
+    }
+    .customer_service {
+      height: 200px;
+      width: 30%;
+      .title {
+        height: 0.8rem;
+        font-size: 0.327rem;
+      }
+      .border {
+        height: 2px;
+        display: flex;
+        justify-content: flex-start;
+        .red {
+          border-bottom: 2px solid #00a0dc;
+          width: 64px;
+          height: 100%;
+        }
+        .gray {
+          border-bottom: 1px solid #707070;
+          flex: 1;
+          height: 100%;
+        }
+      }
+      .list {
+        padding-left: 0.2rem;
+        padding-right: 0.2rem;
+        opacity: 0.7;
+        font-size: 0.188rem;
+        height: 80px;
+        line-height: 0.5rem;
+        border-bottom: 1px solid #707070;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        div {
+          height: auto;
+          width: auto;
+        }
+        div:hover {
+          cursor: pointer; //鼠标变手
+        }
+      }
+    }
+    .follow_us {
+      height: 200px;
+      width: 30%;
+      .title {
+        height: 0.8rem;
+        font-size: 0.327rem;
+      }
+      .border {
+        height: 2px;
+        display: flex;
+        justify-content: flex-start;
+        .red {
+          border-bottom: 2px solid #00a0dc;
+          width: 64px;
+          height: 100%;
+        }
+        .gray {
+          border-bottom: 1px solid #707070;
+          flex: 1;
+          height: 100%;
+        }
+      }
+      .secCode {
+        width: 100%;
+        margin: 20px;
+        display: flex;
+        div {
+          text-align: center;
+          padding: 5px;
+          width: 40%;
+          p {
+            padding: 3px;
+            opacity: 0.7;
+            font-size: 0.188rem;
+          }
+        }
+      }
+    }
+    .contact_us {
+      height: 200px;
+      width: 30%;
+      .title {
+        height: 0.8rem;
+        font-size: 0.327rem;
+      }
+      .border {
+        height: 2px;
+        display: flex;
+        justify-content: flex-start;
+        .red {
+          border-bottom: 2px solid #00a0dc;
+          width: 64px;
+          height: 100%;
+        }
+        .gray {
+          border-bottom: 1px solid #707070;
+          flex: 1;
+          height: 100%;
+        }
+      }
+      .address {
+        opacity: 0.7;
+        font-size: 0.188rem;
+        line-height: 0.36rem;
+        height: 50px;
+        padding-left: 0.2rem;
+        padding-right: 0.2rem;
+      }
+      .tel {
+        margin-top: 0.22rem;
+        opacity: 0.7;
+        font-size: 0.188rem;
+        line-height: 0.36rem;
+        height: 35px;
+        padding-left: 0.2rem;
+        padding-right: 0.2rem;
+      }
+      .qq {
+        opacity: 0.7;
+        font-size: 0.188rem;
+        line-height: 0.36rem;
+        height: 35px;
+        padding-left: 0.2rem;
+        padding-right: 0.2rem;
+      }
+      .email {
+        opacity: 0.7;
+        font-size: 0.188rem;
+        line-height: 0.36rem;
+        height: 35px;
+        padding-left: 0.2rem;
+        padding-right: 0.2rem;
+      }
+    }
+  }
+  .footer_right {
+    position: relative;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #000;
+    // opacity: 0.7;
+    font-size: 14px;
+    a {
+      text-decoration: none;
+      color: #fff;
+      cursor: pointer;
+      display: inline-block;
+    }
+    .it {
+    }
+    .aggrement {
+      display: inline-block;
+    }
+  }
+}
+@media (max-width: 768px) {
+  .footer {
+    flex-direction: column;
+    padding-top: 50px !important;
+    height: auto !important;
+    .foot_content {
+      flex-direction: column !important;
+      height: auto !important;
+      .contact_us,
+      .customer_service,
+      .follow_us {
+        font-size: 14px !important;
+        width: 100% !important;
+        .address {
+          line-height: 20px !important;
+        }
+      }
+      .contact_us {
+        .title {
+          margin-bottom: 10px !important;
+          font-size: 16px !important;
+        }
+        .tel {
+          margin-top: 20px !important;
+        }
+        .tel,
+        .qq,
+        .email,
+        .address {
+          font-size: 14px !important;
+        }
+      }
+      .customer_service {
+        .title {
+          margin-top: 15px !important;
+          margin-bottom: 10px !important;
+          font-size: 16px !important;
+        }
+        .list {
+          div {
+            font-size: 14px !important;
+          }
+        }
+      }
+      .follow_us {
+        margin-top: 20px !important;
+        .title {
+          margin-bottom: 10px !important;
+          font-size: 16px !important;
+        }
+        .secCode p {
+          font-size: 14px !important;
+        }
+      }
+    }
+    .footer_right {
+      position: relative;
+      flex-direction: column;
+      padding-bottom: 20px !important;
+    }
+    .it {
+      text-align: center !important;
+      font-size: 14px !important;
+    }
+    .aggrement {
+      font-size: 14px !important;
+    }
+    .privacyPolicy {
+      font-size: 14px !important;
+    }
+  }
+}
+</style>
diff --git a/src/components/TaskSelect/taskSelectSingle.vue b/src/components/TaskSelect/taskSelectSingle.vue
index e7ffe96..297e2e7 100644
--- a/src/components/TaskSelect/taskSelectSingle.vue
+++ b/src/components/TaskSelect/taskSelectSingle.vue
@@ -167,7 +167,6 @@
           workstationId: null,
           workstationCode: null,
           workstationName: null,
-          routeId: null,
           processId: this.processId,
           processCode: null,
           processName: null,
@@ -217,7 +216,6 @@
       getList() {
         this.loading = true;
         listProtask(this.queryParams).then(response => {
-          debugger;
           this.protaskList = response.rows;
           this.total = response.total;
           this.loading = false;
diff --git a/src/components/qcindexSelect/single.vue b/src/components/qcindexSelect/single.vue
index 091dfcd..b369c95 100644
--- a/src/components/qcindexSelect/single.vue
+++ b/src/components/qcindexSelect/single.vue
@@ -130,7 +130,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
diff --git a/src/components/stockSelect/single.vue b/src/components/stockSelect/single.vue
index 27d4c7c..65a9650 100644
--- a/src/components/stockSelect/single.vue
+++ b/src/components/stockSelect/single.vue
@@ -161,7 +161,7 @@ export default {
     return {
       showFlag:false,
       // 遮罩层
-      loading: true,
+      loading: false,
       // 选中数组
       selectedId: null,
       selectedRow: null,
@@ -244,19 +244,19 @@ export default {
     getList() {
       this.loading = true;
       listWmstock(this.queryParams).then(response => {
-        if(response.rows){
-          debugger;
-          if(this.warehouseCode != null && this.warehouseCode != undefined && this.warehouseCode.indexOf('VIR') >0 ){
-            this.wmstockList = response.rows;
-          }else {
-            //如果不是查询线边库的物资，则在查询结果中过滤掉线边库的数据
-            this.wmstockList = response.rows.filter((el) =>{
-              return el.warehouseCode.indexOf('VIR') == -1;
-            });
-          }
+        // if(response.rows){
+        //   if(this.warehouseCode.indexOf('VIR') == -1){
+        //     //如果不是查询线边库的物资，则在查询结果中过滤掉线边库的数据
+        //     this.wmstockList = response.rows.filter((el) =>{
+        //     return el.warehouseCode.indexOf('VIR') == -1;
+        //     });
+        //   }
+        //   this.total = response.total;
+        //   this.loading = false;
+        // }
+          this.wmstockList = response.rows
           this.total = response.total;
           this.loading = false;
-        }
       });
     },
     /** 查询分类下拉树结构 */
diff --git a/src/components/workorderSelect/single.vue b/src/components/workorderSelect/single.vue
index 66d90df..72e7495 100644
--- a/src/components/workorderSelect/single.vue
+++ b/src/components/workorderSelect/single.vue
@@ -74,7 +74,7 @@
         <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
         <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
         <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-        <el-table-column label="工单数量" align="center" prop="quantity" />                 
+        <el-table-column label="计划数量" align="center" prop="quantity" />                 
         <el-table-column label="客户编码" align="center" prop="clientCode" />
         <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
         <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
diff --git a/src/components/workstationSelect/simpletableSingle.vue b/src/components/workstationSelect/simpletableSingle.vue
index 2e11c06..13fd66e 100644
--- a/src/components/workstationSelect/simpletableSingle.vue
+++ b/src/components/workstationSelect/simpletableSingle.vue
@@ -30,7 +30,7 @@
               </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <!-- <el-col :span="7">
           <el-form-item label="所在车间" prop="workshopName">
             <el-select v-model="queryParams.workshopId" placeholder="请选择车间">
               <el-option
@@ -41,7 +41,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="3">
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -178,7 +178,7 @@ export default {
         workstationCode: null,
         workstationName: null,
         workstationAddress: null,
-        workshopId: null,
+        workshopId: "214",
         workshopCode: null,
         workshopName: null,
         processId: null,
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 39b3dad..2cc5270 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,33 +1,62 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger
+      id="hamburger-container"
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
 
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+    <breadcrumb
+      id="breadcrumb-container"
+      class="breadcrumb-container"
+      v-if="!topNav"
+    />
+
+    <!--图片-->
+    <div
+      style="
+        display: inline-block;
+        width: 66%;
+        margin-left: 30px;
+        line-height: 40px;
+      "
+    >
+      <!--<el-image src="/images/logo.png" style="width:100%;height:40px"></el-image>-->
+      <el-image
+        v-show="this.companyImg != null || this.companyImg !=''"
+        :src="this.companyImg"
+        style="width: 100%; height: 46px"
+      ></el-image>
+    </div>
+
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-        
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+      <template v-if="device !== 'mobile'">
+        <!-- <search id="header-search" class="right-menu-item" /> -->
+
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
+        </el-tooltip> -->
       </template>
 
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+      <el-dropdown
+        class="avatar-container right-menu-item hover-effect"
+        trigger="click"
+      >
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img :src="avatar" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -47,15 +76,17 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+import { mapGetters } from "vuex";
+import Breadcrumb from "@/components/Breadcrumb";
+import TopNav from "@/components/TopNav";
+import Hamburger from "@/components/Hamburger";
+import Screenfull from "@/components/Screenfull";
+import SizeSelect from "@/components/SizeSelect";
+import Search from "@/components/HeaderSearch";
+import RuoYiGit from "@/components/RuoYi/Git";
+import RuoYiDoc from "@/components/RuoYi/Doc";
+
+import * as ownerServer from "@/api/ownerContract";
 
 export default {
   components: {
@@ -66,48 +97,63 @@ export default {
     SizeSelect,
     Search,
     RuoYiGit,
-    RuoYiDoc
+    RuoYiDoc,
+  },
+  created() {
+    this.getOwnInfo();
+  },
+  data() {
+    return {
+      companyImg: null,
+    };
   },
   computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'device'
-    ]),
+    ...mapGetters(["sidebar", "avatar", "device"]),
     setting: {
       get() {
-        return this.$store.state.settings.showSettings
+        return this.$store.state.settings.showSettings;
       },
       set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
+        this.$store.dispatch("settings/changeSetting", {
+          key: "showSettings",
+          value: val,
+        });
+      },
     },
     topNav: {
       get() {
-        return this.$store.state.settings.topNav
-      }
-    }
+        return this.$store.state.settings.topNav;
+      },
+    },
   },
   methods: {
     toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch("app/toggleSideBar");
+    },
+    getOwnInfo() {
+      ownerServer.getOrganInfo().then((res) => {
+        if (res.code === 200 && res.data) {
+          this.companyImg = res.data.picture;
+          console.log(companyImg);
+          this.isEdit = true;
+        }
+      });
     },
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+      this.$confirm("确定注销并退出系统吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$store.dispatch("LogOut").then(() => {
+            location.href = "/index";
+          });
         })
-      }).catch(() => {});
-    }
-  }
-}
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -116,18 +162,18 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
 
@@ -164,10 +210,10 @@ export default {
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index a01527c..5129612 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,22 +1,23 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+      <!-- 制造大师 -->
+        <img src="../../../assets/images/logo-b.png" class="sidebar-logo-small">
+      <!-- 蚂蚁工业 -->
+        <!-- <img src="../../../assets/images/logo-b1.png" class="sidebar-logo-small"> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+      <!-- 制造大师 -->
+        <img src="../../../assets/images/logo-small.png" class="sidebar-logo">
+      <!-- 蚂蚁工业 -->
+        <!-- <img src="../../../assets/images/logo-small1.png" class="sidebar-logo"> -->
       </router-link>
     </transition>
   </div>
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
-import variables from '@/assets/styles/variables.scss'
-
 export default {
   name: 'SidebarLogo',
   props: {
@@ -25,18 +26,10 @@ export default {
       required: true
     }
   },
-  computed: {
-    variables() {
-      return variables;
-    },
-    sideTheme() {
-      return this.$store.state.settings.sideTheme
-    }
-  },
   data() {
     return {
-      title: '苦糖果MES',
-      logo: logoImg
+      title: 'Vue Element Admin',
+      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
     }
   }
 }
@@ -54,10 +47,11 @@ export default {
 
 .sidebar-logo-container {
   position: relative;
-  width: 100%;
-  height: 50px;
-  line-height: 50px;
-  background: #2b2f3a;
+  width: 85%;
+  margin-left: 5px;
+  height: 62px;
+  line-height: 62px;
+  background: #FFFFFF;
   text-align: center;
   overflow: hidden;
 
@@ -66,12 +60,19 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 100%;
+      height: 85%;
       vertical-align: middle;
       margin-right: 12px;
     }
 
+    & .sidebar-logo-small{
+      width: 100%;
+      height: 70%;
+      vertical-align: middle;
+      margin-right: 0px;
+    }
+
     & .sidebar-title {
       display: inline-block;
       margin: 0;
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 51d0839..d790ea9 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,26 +1,60 @@
 <template>
-    <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
-        <logo v-if="showLogo" :collapse="isCollapse" />
-        <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
-            <el-menu
-                :default-active="activeMenu"
-                :collapse="isCollapse"
-                :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
-                :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
-                :unique-opened="true"
-                :active-text-color="settings.theme"
-                :collapse-transition="false"
-                mode="vertical"
-            >
-                <sidebar-item
-                    v-for="(route, index) in sidebarRouters"
-                    :key="route.path  + index"
-                    :item="route"
-                    :base-path="route.path"
-                />
-            </el-menu>
-        </el-scrollbar>
+  <div
+    :class="{ 'has-logo': showLogo }"
+    :style="{
+      backgroundColor:
+        settings.sideTheme === 'theme-dark'
+          ? variables.menuBackground
+          : variables.menuLightBackground,
+    }"
+  >
+    <logo v-if="showLogo" :collapse="isCollapse" />
+    <el-scrollbar
+      :class="settings.sideTheme"
+      wrap-class="scrollbar-wrapper"
+      style="height: 80%"
+    >
+      <el-menu
+        :default-active="activeMenu"
+        :collapse="isCollapse"
+        :background-color="
+          settings.sideTheme === 'theme-dark'
+            ? variables.menuBackground
+            : variables.menuLightBackground
+        "
+        :text-color="
+          settings.sideTheme === 'theme-dark'
+            ? variables.menuColor
+            : variables.menuLightColor
+        "
+        :unique-opened="true"
+        :active-text-color="settings.theme"
+        :collapse-transition="false"
+        mode="vertical"
+      >
+        <sidebar-item
+          v-for="(route, index) in sidebarRouters"
+          :key="route.path + index"
+          :item="route"
+          :base-path="route.path"
+        />
+      </el-menu>
+    </el-scrollbar>
+    <div
+      style="
+        height: 10%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      "
+      @click="stop"
+    >
+      <img src="../../../assets/images/emergencyStop.png" style="width: 90px" />
     </div>
+    <div style="height: 10%; width: 100%; font-size: 13px">
+      【紧急制动，所有设备全部停止】
+    </div>
+  </div>
 </template>
 
 <script>
@@ -28,30 +62,85 @@ import { mapGetters, mapState } from "vuex";
 import Logo from "./Logo";
 import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.scss";
+import axios from "axios";
 
 export default {
-    components: { SidebarItem, Logo },
-    computed: {
-        ...mapState(["settings"]),
-        ...mapGetters(["sidebarRouters", "sidebar"]),
-        activeMenu() {
-            const route = this.$route;
-            const { meta, path } = route;
-            // if set path, the sidebar will highlight the path you set
-            if (meta.activeMenu) {
-                return meta.activeMenu;
-            }
-            return path;
-        },
-        showLogo() {
-            return this.$store.state.settings.sidebarLogo;
-        },
-        variables() {
-            return variables;
-        },
-        isCollapse() {
-            return !this.sidebar.opened;
+  components: { SidebarItem, Logo },
+  computed: {
+    ...mapState(["settings"]),
+    ...mapGetters(["sidebarRouters", "sidebar"]),
+    activeMenu() {
+      const route = this.$route;
+      const { meta, path } = route;
+      // if set path, the sidebar will highlight the path you set
+      if (meta.activeMenu) {
+        return meta.activeMenu;
+      }
+      return path;
+    },
+    showLogo() {
+      return this.$store.state.settings.sidebarLogo;
+    },
+    variables() {
+      return variables;
+    },
+    isCollapse() {
+      return !this.sidebar.opened;
+    },
+  },
+  methods: {
+    stop() {
+      this.$confirm(
+        "确定制动后，车间内所有设备将全部紧急停止运行，请谨慎操作! 如确定要进行紧急制动，请点击【确定】按钮!",
+        "紧急制动确认",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         }
-    }
+      )
+        .then(() => {
+          axios
+            .get("http://192.168.50.191:8077/manage/task/emergencyStop")
+            .then((res) => {
+              if (res.code === 200) {
+                this.$message({
+                  message: "紧急制动成功",
+                  type: "success",
+                });
+              } else {
+                this.$message({
+                  message: "紧急制动失败",
+                  type: "error",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消",
+          });
+        });
+    },
+  },
 };
 </script>
+
+<style lang="scss">
+.el-message-box {
+  width: 430px !important;
+  border: 0px solid #ebeef5 !important;
+}
+.el-message-box__header {
+  background: #922423 !important;
+  color: #fff !important;
+}
+.el-message-box__title {
+  color: #fdf3f7 !important;
+}
+.el-message-box__content {
+  color: #fdf3f7 !important;
+  background: #cf3533 !important;
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 3cd0b44..6aef316 100644
--- a/src/main.js
+++ b/src/main.js
@@ -40,6 +40,13 @@ import DictData from '@/components/DictData'
 import webSite from '@/config/website'
 Vue.prototype.website = webSite
 
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css' // 默认主题
+
+//全局修改默认配置，点击空白处不能关闭弹窗
+ElementUI.Dialog.props.closeOnClickModal.default = false
+Vue.use(ElementUI)
+
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
diff --git a/src/router/index.js b/src/router/index.js
index 8a46228..12e4010 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,10 +1,10 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-Vue.use(Router)
+Vue.use(Router);
 
 /* Layout */
-import Layout from '@/layout'
+import Layout from "@/layout";
 
 /**
  * Note: 路由配置项
@@ -31,232 +31,250 @@ import Layout from '@/layout'
 // 公共路由
 export const constantRoutes = [
   {
-    path: '/redirect',
+    path: "/redirect",
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect')
-      }
-    ]
+        path: "/redirect/:path(.*)",
+        component: () => import("@/views/redirect"),
+      },
+    ],
   },
   {
-    path: '/login',
-    component: () => import('@/views/login'),
-    hidden: true
+    path: "/login",
+    component: () => import("@/views/login"),
+    hidden: true,
   },
   {
-    path: '/register',
-    component: () => import('@/views/register'),
-    hidden: true
+    path: "/register",
+    component: () => import("@/views/register"),
+    hidden: true,
   },
   {
-    path: '/404',
-    component: () => import('@/views/error/404'),
-    hidden: true
+    path: "/404",
+    component: () => import("@/views/error/404"),
+    hidden: true,
   },
   {
-    path: '/401',
-    component: () => import('@/views/error/401'),
-    hidden: true
+    path: "/401",
+    component: () => import("@/views/error/401"),
+    hidden: true,
   },
+  // {
+  //   path: "",
+  //   component: Layout,
+  //   redirect: "index",
+  //   children: [
+  //     {
+  //       path: "index",
+  //       component: () => import("@/views/index"),
+  //       name: "Index",
+  //       meta: { title: "首页", icon: "dashboard", affix: true },
+  //     },
+  //   ],
+  // },
   {
-    path: '',
+    path: "",
     component: Layout,
-    redirect: 'index',
+    redirect: "index",
     children: [
       {
-        path: 'index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
+        path: "index",
+        component: () => import("@/views/mes/pro/production/index"),
+        name: "Index",
+        // meta: { title: "首页", icon: "dashboard", affix: true },
+      },
+    ],
   },
   {
-    path: '/user',
+    path: "/user",
     component: Layout,
     hidden: true,
-    redirect: 'noredirect',
+    redirect: "noredirect",
     children: [
       {
-        path: 'profile',
-        component: () => import('@/views/system/user/profile/index'),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
-      }
-    ]
-  }
-]
+        path: "profile",
+        component: () => import("@/views/system/user/profile/index"),
+        name: "Profile",
+        meta: { title: "个人中心", icon: "user" },
+      },
+    ],
+  },
+];
 
 // 动态路由，基于用户权限动态去加载
 export const dynamicRoutes = [
   {
-    path: '/system/user-auth',
+    path: "/system/user-auth",
     component: Layout,
     hidden: true,
-    permissions: ['system:user:edit'],
+    permissions: ["system:user:edit"],
     children: [
       {
-        path: 'role/:userId(\\d+)',
-        component: () => import('@/views/system/user/authRole'),
-        name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
-      }
-    ]
+        path: "role/:userId(\\d+)",
+        component: () => import("@/views/system/user/authRole"),
+        name: "AuthRole",
+        meta: { title: "分配角色", activeMenu: "/system/user" },
+      },
+    ],
   },
   {
-    path: '/system/role-auth',
+    path: "/system/role-auth",
     component: Layout,
     hidden: true,
-    permissions: ['system:role:edit'],
+    permissions: ["system:role:edit"],
     children: [
       {
-        path: 'user/:roleId(\\d+)',
-        component: () => import('@/views/system/role/authUser'),
-        name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
-      }
-    ]
+        path: "user/:roleId(\\d+)",
+        component: () => import("@/views/system/role/authUser"),
+        name: "AuthUser",
+        meta: { title: "分配用户", activeMenu: "/system/role" },
+      },
+    ],
   },
   {
-    path: '/system/dict-data',
+    path: "/system/dict-data",
     component: Layout,
     hidden: true,
-    permissions: ['system:dict:list'],
+    permissions: ["system:dict:list"],
     children: [
       {
-        path: 'index/:dictId(\\d+)',
-        component: () => import('@/views/system/dict/data'),
-        name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
-      }
-    ]
+        path: "index/:dictId(\\d+)",
+        component: () => import("@/views/system/dict/data"),
+        name: "Data",
+        meta: { title: "字典数据", activeMenu: "/system/dict" },
+      },
+    ],
   },
   {
-    path: '/system/autocodePart',
+    path: "/system/autocodePart",
     component: Layout,
     hidden: true,
-    permissions: ['system:autocode:part:list'],
+    permissions: ["system:autocode:part:list"],
     children: [
       {
-        path: 'index/:ruleId(\\d+)',
-        component: () => import('@/views/system/autocode/part'),
-        name: 'AutoCode',
-        meta: { title: '规则组成', activeMenu: '/system/autocode' }
-      }
-    ]
+        path: "index/:ruleId(\\d+)",
+        component: () => import("@/views/system/autocode/part"),
+        name: "AutoCode",
+        meta: { title: "规则组成", activeMenu: "/system/autocode" },
+      },
+    ],
   },
   {
-    path: '/mes/wm/location',
+    path: "/mes/wm/location",
     component: Layout,
     hidden: true,
-    permissions: ['mes:wm:location:list'],
+    permissions: ["mes:wm:location:list"],
     children: [
       {
-        path: 'index',
-        component: () => import('@/views/mes/wm/location/index'),
-        name: 'locationList',
-        meta: { title: '库区设置', activeMenu: '/mes/wm/location' }
-      }
-    ]
+        path: "index",
+        component: () => import("@/views/mes/wm/location/index"),
+        name: "locationList",
+        meta: { title: "库区设置", activeMenu: "/mes/wm/location" },
+      },
+    ],
   },
   {
-    path: '/mes/wm/area',
+    path: "/mes/wm/area",
     component: Layout,
     hidden: true,
-    permissions: ['mes:wm:area:list'],
+    permissions: ["mes:wm:area:list"],
     children: [
       {
-        path: 'index',
-        component: () => import('@/views/mes/wm/area/index'),
-        name: 'areaList',
-        meta: { title: '库位设置', activeMenu: '/mes/wm/area' }
-      }
-    ]
+        path: "index",
+        component: () => import("@/views/mes/wm/area/index"),
+        name: "areaList",
+        meta: { title: "库位设置", activeMenu: "/mes/wm/area" },
+      },
+    ],
   },
   {
-    path: '/mes/pro/schedule',
+    path: "/mes/pro/schedule",
     component: Layout,
     hidden: true,
-    permissions: ['mes:pro:protask:edit'],
+    permissions: ["mes:pro:protask:edit"],
     children: [
       {
-        path: 'ganttedit',
+        path: "ganttedit",
         component: () => import("@/views/mes/pro/schedule/ganttedit"),
-        name: 'ganttEdit',
-        meta: {title: '使用甘特图排产',activeMenu: '/mes/pro/schedule'}
-      }
-    ]
+        name: "ganttEdit",
+        meta: { title: "使用甘特图排产", activeMenu: "/mes/pro/schedule" },
+      },
+    ],
   },
   {
-    path: '/monitor/job-log',
+    path: "/monitor/job-log",
     component: Layout,
     hidden: true,
-    permissions: ['monitor:job:list'],
+    permissions: ["monitor:job:list"],
     children: [
       {
-        path: 'index',
-        component: () => import('@/views/monitor/job/log'),
-        name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
-      }
-    ]
+        path: "index",
+        component: () => import("@/views/monitor/job/log"),
+        name: "JobLog",
+        meta: { title: "调度日志", activeMenu: "/monitor/job" },
+      },
+    ],
   },
   {
-    path: '/tool/gen-edit',
+    path: "/tool/gen-edit",
     component: Layout,
     hidden: true,
-    permissions: ['tool:gen:edit'],
+    permissions: ["tool:gen:edit"],
     children: [
       {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/gen/editTable'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
-      }
-    ]
+        path: "index/:tableId(\\d+)",
+        component: () => import("@/views/tool/gen/editTable"),
+        name: "GenEdit",
+        meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
+      },
+    ],
   },
   {
-    path: '/mes/qc/pendinginspect/add',
+    path: "/mes/qc/pendinginspect/add",
     component: Layout,
     hidden: true,
-    permissions: ['mes:qc:pending'],
+    permissions: ["mes:qc:pending"],
     children: [
       {
-        path: 'iqc',
-        component: () => import('@/views/mes/qc/pendinginspect/iqc'),
-        name: 'iqcadd',
+        path: "iqc",
+        component: () => import("@/views/mes/qc/pendinginspect/iqc"),
+        name: "iqcadd",
         props: true,
-        meta: {title: '来料检验', activeMenu: '/mes/qc/pendinginspect/iqc'}
+        meta: { title: "来料检验", activeMenu: "/mes/qc/pendinginspect/iqc" },
       },
       {
-        path: 'pqc',
-        component: () => import('@/views/mes/qc/pendinginspect/pqc'),
-        name: 'pqcadd',
+        path: "pqc",
+        component: () => import("@/views/mes/qc/pendinginspect/pqc"),
+        name: "pqcadd",
         props: true,
-        meta: {title: '过程检验', activeMenu: '/mes/qc/pendinginspect/pqc'}
+        meta: { title: "过程检验", activeMenu: "/mes/qc/pendinginspect/pqc" },
       },
       {
-        path: 'oqc',
-        component: () => import('@/views/mes/qc/oqc/index'),
-        name: 'oqcadd',
+        path: "oqc",
+        component: () => import("@/views/mes/qc/oqc/index"),
+        name: "oqcadd",
         props: true,
-        meta: {title: '出厂检验', activeMenu: '/mes/qc/pendinginspect/oqc'}
-      }
-    ]
-  }
-]
+        meta: { title: "出厂检验", activeMenu: "/mes/qc/pendinginspect/oqc" },
+      },
+    ],
+  },
+];
 
 // 防止连续点击多次路由报错
 let routerPush = Router.prototype.push;
 Router.prototype.push = function push(location) {
-  return routerPush.call(this, location).catch(err => err)
-}
+  return routerPush.call(this, location).catch((err) => err);
+};
 
 export default new Router({
-  mode: 'history', // 去掉url中的#
+  mode: "history", // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
-  routes: constantRoutes
-})
+  routes: constantRoutes,
+});
+
+export function resetRouter() {
+  const newRouter = createRouter();
+  Router.matcher = newRouter.matcher; // 重制 router
+}
diff --git a/src/store/modules/companyImg.js b/src/store/modules/companyImg.js
new file mode 100644
index 0000000..9f1f1f0
--- /dev/null
+++ b/src/store/modules/companyImg.js
@@ -0,0 +1,19 @@
+const state = {
+  companyImg:localStorage.getItem("logo"),
+  isLogo:false
+}
+
+const mutations = {
+  SET_LOGO(state,img){
+    state.companyImg = img
+  },
+  SET_IS_LOGO(state,isLogo) {
+    state.isLogo = isLogo;
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ab0a6fe..7921016 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,96 +1,106 @@
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { login, logout, getInfo } from "@/api/login";
+import { getToken, setToken, removeToken } from "@/utils/auth";
 
 const user = {
   state: {
     token: getToken(),
-    name: '',
-    avatar: '',
+    name: "",
+    avatar: "",
     roles: [],
-    permissions: []
+    permissions: [],
   },
 
   mutations: {
     SET_TOKEN: (state, token) => {
-      state.token = token
+      state.token = token;
     },
     SET_NAME: (state, name) => {
-      state.name = name
+      state.name = name;
     },
     SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
+      state.avatar = avatar;
     },
     SET_ROLES: (state, roles) => {
-      state.roles = roles
+      state.roles = roles;
     },
     SET_PERMISSIONS: (state, permissions) => {
-      state.permissions = permissions
-    }
+      state.permissions = permissions;
+    },
   },
 
   actions: {
     // 登录
     Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const code = userInfo.code
-      const uuid = userInfo.uuid
+      const username = userInfo.username.trim();
+      const password = userInfo.password;
+      const code = userInfo.code;
+      const uuid = userInfo.uuid;
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
-          setToken(res.token)
-          commit('SET_TOKEN', res.token)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
+        login(username, password, code, uuid)
+          .then((res) => {
+            setToken(res.token);
+            commit("SET_TOKEN", res.token);
+            resolve();
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
     },
 
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        getInfo().then(res => {
-          const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
-          } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', user.userName)
-          commit('SET_AVATAR', avatar)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
+        getInfo()
+          .then((res) => {
+            const user = res.user;
+            const avatar =
+              user.avatar == "" || user.avatar == null
+                ? require("@/assets/images/profile.jpg")
+                : user.avatar;
+            if (res.roles && res.roles.length > 0) {
+              // 验证返回的roles是否是一个非空数组
+              commit("SET_ROLES", res.roles);
+              commit("SET_PERMISSIONS", res.permissions);
+            } else {
+              commit("SET_ROLES", ["ROLE_DEFAULT"]);
+            }
+            commit("SET_NAME", user.userName);
+            commit("SET_AVATAR", avatar);
+            resolve(res);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
     },
 
     // 退出系统
     LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          commit('SET_PERMISSIONS', [])
-          removeToken()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
+        logout(state.token)
+          .then(() => {
+            commit("SET_TOKEN", "");
+            commit("SET_ROLES", []);
+            commit("SET_PERMISSIONS", []);
+            removeToken();
+            resolve();
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
     },
 
     // 前端 登出
     FedLogOut({ commit }) {
-      return new Promise(resolve => {
-        commit('SET_TOKEN', '')
-        removeToken()
-        resolve()
-      })
-    }
-  }
-}
+      return new Promise((resolve) => {
+        commit("SET_TOKEN", "");
+        removeToken();
+        resolve();
+      });
+    },
+  },
+};
 
-export default user
+export default user;
diff --git a/src/utils/request.js b/src/utils/request.js
index 20b613f..635ce2a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -49,7 +49,7 @@ service.interceptors.request.use(config => {
       const s_url = sessionObj.url;                  // 请求地址
       const s_data = sessionObj.data;                // 请求数据
       const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      const interval = 5000;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)
diff --git a/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue b/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue
new file mode 100644
index 0000000..ce1ce33
--- /dev/null
+++ b/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <!-- <el-form-item label="异常报警类型" label-width="100px" prop="subjectType">
+        <el-select
+          v-model="queryParams.subjectType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item label="处理状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in statusArr"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >处理</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >置顶</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="abnormal" label="设备是否异常:">
+              <el-radio-group v-model="form.abnormal">
+                <el-radio :label="1">异常</el-radio>
+                <el-radio :label="2">无异常</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <el-form-item prop="status" label="是否解决:">
+              <el-radio-group v-model="form.status">
+                <el-radio :label="1">已解决</el-radio>
+                <el-radio :label="2">未解决</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 置顶 -->
+    <el-dialog
+      title="置顶"
+      :visible.sync="openTop"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="top" label="设备是否异常:">
+              <el-radio-group v-model="form.top">
+                <el-radio :label="0">不置顶</el-radio>
+                <el-radio :label="1">置顶</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleForm">确 定</el-button>
+        <el-button @click="openopenTop">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="11">
+            <el-form-item prop="" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "AGV",
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+      //置顶弹框
+      openTop: false,
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+        top: [{ required: true, message: "是否置顶不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+
+    // 取消按钮
+    openopenTop() {
+      this.openTop = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 处理 */
+    handleUpdate(row) {
+      this.reset();
+      this.open = true;
+      this.title = "处理";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      this.reset();
+      this.openTop = true;
+    },
+
+    /** 置顶提交按钮 */
+    handleForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue b/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue
new file mode 100644
index 0000000..7ce09fe
--- /dev/null
+++ b/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <!-- <el-form-item label="异常报警类型" label-width="100px" prop="subjectType">
+        <el-select
+          v-model="queryParams.subjectType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "AGV",
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      console.log(row);
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/AGValarm/index.vue b/src/views/abnormalityAlarm/AGValarm/index.vue
new file mode 100644
index 0000000..59d8ea1
--- /dev/null
+++ b/src/views/abnormalityAlarm/AGValarm/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="app-container">
+    <!-- 切换 -->
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="异常报警" name="1">
+        <abnormalAGV />
+      </el-tab-pane>
+      <el-tab-pane label="历史异常报警" name="2">
+        <historicalAGV />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import abnormalAGV from "./abnormalAGV.vue";
+import historicalAGV from "./historicalAGV.vue";
+
+export default {
+  components: { abnormalAGV, historicalAGV },
+  data() {
+    return {
+      //默认tab切换为1
+      activeName: "1",
+    };
+  },
+  methods: {
+    //点击tab切换
+    handleClick() {
+      this.activeName = "2";
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  line-height: 40px;
+  display: flex;
+}
+</style>
diff --git a/src/views/abnormalityAlarm/liku/abnormalLiku.vue b/src/views/abnormalityAlarm/liku/abnormalLiku.vue
new file mode 100644
index 0000000..e9adad8
--- /dev/null
+++ b/src/views/abnormalityAlarm/liku/abnormalLiku.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <!-- <el-form-item label="异常报警类型" label-width="100px" prop="warnType">
+        <el-select
+          v-model="queryParams.warnType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item label="处理状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in statusArr"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >处理</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >置顶</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="abnormal" label="设备是否异常:">
+              <el-radio-group v-model="form.abnormal">
+                <el-radio :label="1">异常</el-radio>
+                <el-radio :label="2">无异常</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <el-form-item prop="status" label="是否解决:">
+              <el-radio-group v-model="form.status">
+                <el-radio :label="1">已解决</el-radio>
+                <el-radio :label="2">未解决</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 置顶 -->
+    <el-dialog
+      title="置顶"
+      :visible.sync="openTop"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="top" label="设备是否异常:">
+              <el-radio-group v-model="form.top">
+                <el-radio :label="0">不置顶</el-radio>
+                <el-radio :label="1">置顶</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleForm">确 定</el-button>
+        <el-button @click="openopenTop">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="11">
+            <el-form-item prop="" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "STORE",
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+      //置顶弹框
+      openTop: false,
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+        top: [{ required: true, message: "是否置顶不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+
+    // 取消按钮
+    openopenTop() {
+      this.openTop = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 处理 */
+    handleUpdate(row) {
+      this.reset();
+      this.open = true;
+      this.title = "处理";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      this.reset();
+      this.openTop = true;
+    },
+
+    /** 置顶提交按钮 */
+    handleForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/liku/historicalLiku.vue b/src/views/abnormalityAlarm/liku/historicalLiku.vue
new file mode 100644
index 0000000..0c2d15b
--- /dev/null
+++ b/src/views/abnormalityAlarm/liku/historicalLiku.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <!-- <el-form-item label="异常报警类型" label-width="100px" prop="subjectType">
+        <el-select
+          v-model="queryParams.subjectType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "STORE",
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      console.log(row);
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/liku/index.vue b/src/views/abnormalityAlarm/liku/index.vue
new file mode 100644
index 0000000..0167dd9
--- /dev/null
+++ b/src/views/abnormalityAlarm/liku/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="app-container">
+    <!-- 切换 -->
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="异常报警" name="1">
+        <abnormalLiku />
+      </el-tab-pane>
+      <el-tab-pane label="历史异常报警" name="2">
+        <historicalLiku />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import abnormalLiku from "./abnormalLiku.vue";
+import historicalLiku from "./historicalLiku.vue";
+
+export default {
+  components: { abnormalLiku, historicalLiku },
+  data() {
+    return {
+      //默认tab切换为1
+      activeName: "1",
+    };
+  },
+  methods: {
+    //点击tab切换
+    handleClick() {
+      this.activeName = "2";
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  line-height: 40px;
+  display: flex;
+}
+</style>
diff --git a/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue b/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue
new file mode 100644
index 0000000..9f24647
--- /dev/null
+++ b/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue
@@ -0,0 +1,514 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <!-- <el-form-item label="异常报警类型" label-width="100px" prop="warnType">
+        <el-select
+          v-model="queryParams.warnType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item label="处理状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in statusArr"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >处理</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >置顶</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="abnormal" label="设备是否异常:">
+              <el-radio-group v-model="form.abnormal">
+                <el-radio :label="1">异常</el-radio>
+                <el-radio :label="2">无异常</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <el-form-item prop="status" label="是否解决:">
+              <el-radio-group v-model="form.status">
+                <el-radio :label="1">已解决</el-radio>
+                <el-radio :label="2">未解决</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 置顶 -->
+    <el-dialog
+      title="置顶"
+      :visible.sync="openTop"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="top" label="设备是否异常:">
+              <el-radio-group v-model="form.top">
+                <el-radio :label="0">不置顶</el-radio>
+                <el-radio :label="1">置顶</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleForm">确 定</el-button>
+        <el-button @click="openopenTop">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="11">
+            <el-form-item prop="" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "CNC",
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+      //置顶弹框
+      openTop: false,
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+        top: [{ required: true, message: "是否置顶不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+
+    // 取消按钮
+    openopenTop() {
+      this.openTop = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 处理 */
+    handleUpdate(row) {
+      this.reset();
+      this.open = true;
+      this.title = "处理";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      console.log(row);
+      this.reset();
+      this.openTop = true;
+    },
+
+    /** 置顶提交按钮 */
+    handleForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue
new file mode 100644
index 0000000..c565ec0
--- /dev/null
+++ b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <!-- <el-form-item label="异常报警类型" label-width="100px" prop="subjectType">
+        <el-select
+          v-model="queryParams.subjectType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "CNC",
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      console.log(row);
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/machineTool/index.vue b/src/views/abnormalityAlarm/machineTool/index.vue
new file mode 100644
index 0000000..731dbe8
--- /dev/null
+++ b/src/views/abnormalityAlarm/machineTool/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="app-container">
+    <!-- 切换 -->
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="异常报警" name="1">
+        <abnormalAlarm />
+      </el-tab-pane>
+      <el-tab-pane label="历史异常报警" name="2">
+        <historicalAnomalyAlarm />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import abnormalAlarm from "./abnormalAlarm.vue";
+import historicalAnomalyAlarm from "./historicalAnomalyAlarm.vue";
+
+export default {
+  components: { abnormalAlarm, historicalAnomalyAlarm },
+  data() {
+    return {
+      //默认tab切换为1
+      activeName: "1",
+    };
+  },
+  methods: {
+    //点击tab切换
+    handleClick() {
+      this.activeName = "2";
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  line-height: 40px;
+  display: flex;
+}
+</style>
diff --git a/src/views/abnormalityAlarm/robotic/historicalAlarm.vue b/src/views/abnormalityAlarm/robotic/historicalAlarm.vue
new file mode 100644
index 0000000..6a880fa
--- /dev/null
+++ b/src/views/abnormalityAlarm/robotic/historicalAlarm.vue
@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <!-- <el-form-item label="异常报警类型" label-width="100px" prop="subjectType">
+        <el-select
+          v-model="queryParams.subjectType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="abnormal" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "ROBOT",
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      console.log(row);
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/abnormalityAlarm/robotic/index.vue b/src/views/abnormalityAlarm/robotic/index.vue
new file mode 100644
index 0000000..acc6f00
--- /dev/null
+++ b/src/views/abnormalityAlarm/robotic/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="app-container">
+    <!-- 切换 -->
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="异常报警" name="1">
+        <roboticAlarm />
+      </el-tab-pane>
+      <el-tab-pane label="历史异常报警" name="2">
+        <historicalAlarm />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import roboticAlarm from "./roboticAlarm.vue";
+import historicalAlarm from "./historicalAlarm.vue";
+
+export default {
+  components: { roboticAlarm, historicalAlarm },
+  data() {
+    return {
+      //默认tab切换为1
+      activeName: "1",
+    };
+  },
+  methods: {
+    //点击tab切换
+    handleClick() {
+      this.activeName = "2";
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.clearfix {
+  line-height: 40px;
+  display: flex;
+}
+</style>
diff --git a/src/views/abnormalityAlarm/robotic/roboticAlarm.vue b/src/views/abnormalityAlarm/robotic/roboticAlarm.vue
new file mode 100644
index 0000000..87d7de7
--- /dev/null
+++ b/src/views/abnormalityAlarm/robotic/roboticAlarm.vue
@@ -0,0 +1,514 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入设备编码/名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <!-- <el-form-item label="异常报警类型" label-width="100px" prop="subjectType">
+        <el-select
+          v-model="queryParams.subjectType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_alarm_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item label="处理状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in statusArr"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="machineryCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="machineryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="设备类别"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="异常报警类型"
+        align="center"
+        prop="warnType"
+        :show-overflow-tooltip="true"
+      /> -->
+      <el-table-column
+        label="异常报警内容"
+        align="center"
+        prop="message"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="异常报警时间"
+        align="center"
+        prop="warnTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="处理状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.status == '0'"
+            >未处理</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '1'"
+            >已处理未解决</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.status == '2'"
+            >已处理已完成</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >处理</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >置顶</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="abnormal" label="设备是否异常:">
+              <el-radio-group v-model="form.abnormal">
+                <el-radio :label="1">异常</el-radio>
+                <el-radio :label="2">无异常</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <el-form-item prop="status" label="是否解决:">
+              <el-radio-group v-model="form.status">
+                <el-radio :label="1">已解决</el-radio>
+                <el-radio :label="2">未解决</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 置顶 -->
+    <el-dialog
+      title="置顶"
+      :visible.sync="openTop"
+      center
+      width="400px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col>
+            <el-form-item prop="top" label="设备是否异常:">
+              <el-radio-group v-model="form.top">
+                <el-radio :label="0">不置顶</el-radio>
+                <el-radio :label="1">置顶</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleForm">确 定</el-button>
+        <el-button @click="openopenTop">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 查看 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openQuery"
+      center
+      width="800px"
+      append-to-body
+    >
+      <el-form ref="form" :model="formQuery" label-width="130px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备编码:">
+              {{ formQuery.machineryCode }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备名称:">
+              {{ formQuery.machineryName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="设备类型:">
+              {{ formQuery.machineryTypeName }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="11">
+            <el-form-item prop="" label="异常报警类型:">
+              {{ formQuery.warnType }}
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警内容:">
+              {{ formQuery.message }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="" label="异常报警时间:">
+              {{ formQuery.warnTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelQuery">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, edit } from "@/api/abnormalityAlarm/machineTool";
+import { getToken } from "@/utils/auth";
+export default {
+  // name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_alarm_type"],
+  components: {},
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查看
+      openQuery: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "ROBOT",
+      },
+      // 表单参数
+      form: {
+        abnormal: 1,
+        status: "",
+        top: 0,
+      },
+      // 查看
+      formQuery: {},
+      //置顶弹框
+      openTop: false,
+
+      statusArr: [
+        {
+          label: "未处理",
+          value: 0,
+        },
+        {
+          label: "已处理未解决",
+          value: 1,
+        },
+        {
+          label: "已处理已完成",
+          value: 2,
+        },
+      ],
+      // 表单校验
+      rules: {
+        abnormal: [
+          { required: true, message: "设备是否异常不能为空", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "是否解决不能为空", trigger: "blur" },
+        ],
+        top: [{ required: true, message: "是否置顶不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮
+    cancelQuery() {
+      this.openQuery = false;
+      this.reset();
+    },
+
+    // 取消按钮
+    openopenTop() {
+      this.openTop = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        abnormal: 1,
+        status: "",
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 查看 **/
+    handleExportArr(row) {
+      this.formQuery = row;
+      this.openQuery = true;
+      this.title = "查看";
+    },
+    /** 处理 */
+    handleUpdate(row) {
+      this.reset();
+      this.open = true;
+      this.title = "处理";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 置顶操作 */
+    handleDelete(row) {
+      console.log(row);
+      this.reset();
+      this.openTop = true;
+    },
+
+    /** 置顶提交按钮 */
+    handleForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          edit(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "处理成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.open = false;
+              this.getList();
+            }
+          });
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/components/personnelSelection.vue b/src/views/components/personnelSelection.vue
new file mode 100644
index 0000000..decaa32
--- /dev/null
+++ b/src/views/components/personnelSelection.vue
@@ -0,0 +1,535 @@
+<template>
+  <div class="app-containers">
+    <p class="title">
+      人员选择（<span v-show="isshow == 2">多选</span
+      ><span v-show="isshow == 1">单选</span>）
+    </p>
+
+    <el-row>
+      <el-col :span="6"
+        ><div class="grid-content one">
+          <!-- 部门的选择 -->
+          <el-container>
+            <el-header
+              class="smallHeader"
+              style="height: 40px; line-height: 40px"
+              >部门
+            </el-header>
+            <el-main class="smallmain">
+              <el-tree
+                v-loading="loading"
+                :data="deptOptions"
+                :props="defaultProps"
+                :expand-on-click-node="false"
+                highlight-current
+                ref="tree"
+                node-key="deptId"
+                :filter-node-method="filterNode"
+                @node-click="handleNodeClick"
+                :default-expand-all="true"
+              >
+              </el-tree>
+            </el-main>
+          </el-container>
+        </div>
+      </el-col>
+      <el-col :span="12"
+        ><div class="grid-content two">
+          <!-- 人员的选择  -->
+          <el-row>
+            <el-col>
+              <el-form
+                :model="queryParams"
+                ref="queryForm"
+                :inline="true"
+                label-width="68px"
+                style="height: 40px"
+              >
+                <el-form-item label="姓名" prop="nickName">
+                  <el-input
+                    v-model.trim="queryParams.userName"
+                    placeholder="请输入姓名"
+                    clearable
+                    size="small"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+                <el-form-item>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >搜索</el-button
+                  >
+                  <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                  >
+                </el-form-item>
+              </el-form>
+            </el-col>
+          </el-row>
+          <el-row>
+            <!-- 多选时 -->
+            <div>
+              <el-col :span="24" class="tableBox" v-show="isshow == 2">
+                <el-table
+                  v-loading="loading"
+                  ref="checked"
+                  :data="userList"
+                  tooltip-effect="dark"
+                  row-key="userId"
+                  style="width: 100%"
+                  @select="selectionRow"
+                  @select-all="selectionRowAll"
+                >
+                  <el-table-column
+                    type="selection"
+                    width="55"
+                    :reserve-selection="true"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="nickName"
+                    label="人员"
+                    show-overflow-tooltip
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="sex"
+                    label="性别"
+                    show-overflow-tooltip
+                  >
+                    <template slot-scope="scope">
+                      <span v-if="scope.row.sex == 0">男</span>
+                      <span v-else-if="scope.row.sex == 1">女</span>
+                      <span v-else>未知</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="dept.deptName"
+                    label="部门"
+                    show-overflow-tooltip
+                  >
+                  </el-table-column>
+                </el-table>
+              </el-col>
+            </div>
+            <!-- 单选时 -->
+            <div class="wrapBox" v-show="isshow == 1">
+              <el-col :span="24" class="tableBox radio">
+                <el-table
+                  v-loading="loading"
+                  ref="radio"
+                  :data="userList"
+                  tooltip-effect="dark"
+                  row-key="userId"
+                  style="width: 100%"
+                  highlight-current-row
+                  @current-change="handleCurrentChange"
+                >
+                  <el-table-column
+                    prop="nickName"
+                    label="人员"
+                    show-overflow-tooltip
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="sex"
+                    label="性别"
+                    show-overflow-tooltip
+                  >
+                    <template slot-scope="scope">
+                      <span v-if="scope.row.sex == 0">男</span>
+                      <span v-else-if="scope.row.sex == 1">女</span>
+                      <span v-else>未知</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="dept.deptName"
+                    label="部门"
+                    show-overflow-tooltip
+                  >
+                  </el-table-column>
+                </el-table>
+              </el-col>
+            </div>
+          </el-row>
+        </div>
+      </el-col>
+      <el-col :span="6"
+        ><div class="grid-content three">
+          <!-- 已选人员 -->
+          <el-container style="padding: 0">
+            <el-header
+              class="smallHeader"
+              style="height: 40px; line-height: 40px"
+              >已选人员
+              <el-button
+                size="small"
+                plain
+                @click="toggleSelection()"
+                class="but1"
+                >删除全部</el-button
+              >
+            </el-header>
+            <el-main class="smallmain tableBox">
+              <p v-if="selectList.length == 0" class="nodata">暂无数据</p>
+              <div class="tagBox" v-else>
+                <el-tag
+                  class="tag"
+                  :key="tag.userId"
+                  v-for="tag in selectList"
+                  closable
+                  :disable-transitions="false"
+                  @close="handleClose(tag)"
+                >
+                  <span class="tagItem">{{ tag.nickName }}</span>
+                  <span v-if="tag.sex == 0" class="tagItem">男</span>
+                  <span v-else-if="tag.sex == 1" class="tagItem">女</span>
+                  <span v-else class="tagItem">未知</span>
+                  <span class="tagItem">{{ tag.deptName }}</span>
+                </el-tag>
+              </div>
+            </el-main>
+          </el-container>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { treeselect } from "@/api/system/dept";
+import { listUser } from "@/api/system/user";
+export default {
+  name: "DepUser",
+  components: { treeselect, listUser },
+  props: ["inputValue"],
+  // props: {
+  //   // 父组件修改时传过来的数据
+  //   inputValue: {
+  //     type: Array,
+  //     default: function () {
+  //       return [];
+  //     },
+  //   },
+  //   // 单选时从父组件传值设置为单选 1 为单选 2为多选（默认）
+  //   // show: {
+  //   //   type: String,
+  //   //   required: false,
+  //   //   default: false,
+  //   // },
+  // },
+  data() {
+    return {
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      // 用户表格数据
+      userList: null,
+      // // 选中的人员
+      // nowList: [],
+      // 最终选中传给父组件的人员
+      selectList: [],
+      // isshow=1,是单选，2是多选
+      isshow: 2,
+      // 遮罩层
+      loading: true,
+      // 表单参数
+      form: {},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10000,
+        userName: undefined,
+        nickName: undefined,
+        mobile: undefined,
+        deptId: undefined,
+      },
+      // 选中的人员
+      selectIdList: [],
+      addInvolvedUserIdVisible: false,
+    };
+  },
+  watch: {
+    inputValue(val) {
+      this.selectList = val;
+      this.getTreeselect();
+      this.$nextTick(() => {});
+    },
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    this.getTreeselect();
+    this.$nextTick(() => {});
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.inputValue.forEach((item) => {
+        this.selectList.push(item);
+      });
+      // if (this.show) {
+      //   this.isshow = this.show;
+      // }
+    });
+  },
+  computed: {
+    user() {
+      return this.$store.state.user;
+    },
+  },
+  methods: {
+    // 单选表格
+    handleCurrentChange(val) {
+      this.selectList = [val];
+      this.$emit("getSelectList", this.selectList);
+    },
+    // 部门  树形数据
+    getTreeselect() {
+      treeselect().then((response) => {
+        let allobj = {
+          id: 0,
+          label: "全体人员",
+        };
+        this.deptOptions = response.data;
+        this.queryParams.deptId = this.user.deptId;
+        this.deptOptions.unshift(allobj);
+        this.loading = false;
+        this.getList();
+      });
+    },
+
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+
+    // 树形节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.getList();
+    },
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.queryParams).then((response) => {
+        this.userList = response.rows;
+        this.loading = false;
+        this.$refs.checked.clearSelection(); //清除回显
+        //  多选表格样式回显
+        this.userList.forEach((i) => {
+          if (this.selectList != "") {
+            this.selectList.forEach((item) => {
+              if (i.userId == item.userId) {
+                this.isshow == 2
+                  ? this.$refs.checked.toggleRowSelection(item) //多选
+                  : this.$refs.radio.setCurrentRow(item, true); // 单选高亮某一行
+              }
+            });
+          }
+        });
+      });
+    },
+    // 表格===>> 取消选择
+    toggleSelection(rows) {
+      this.selectList = [];
+      this.$refs.checked.clearSelection();
+      if (this.isshow == 1) {
+        this.$refs.radio.setCurrentRow();
+        this.selectList.splice(this.selectList.indexOf(rows), 1);
+      }
+      this.$emit("getSelectList", this.selectList);
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    // 已选人员===>>> 删除
+    handleClose(tag) {
+      // 多选
+      if (this.isshow == 2) {
+        this.selectList.splice(this.selectList.indexOf(tag), 1);
+        this.$refs.checked.toggleRowSelection(tag, false);
+      }
+      // 单选
+      if (this.isshow == 1) {
+        this.$refs.radio.setCurrentRow();
+        this.selectList.splice(this.selectList.indexOf(tag), 1);
+      }
+      if (this.inputValue) {
+        this.$refs.checked.toggleRowSelection(tag, false); //多选
+        this.getList();
+      }
+      this.$emit("getSelectList", this.selectList);
+    },
+    // 判断复选框状态
+    selectionRow(selection, row) {
+      let selected = selection.length && selection.indexOf(row) !== -1; //为true时选中，为 0（或者false）时未选中
+      if (selected) {
+        this.selectList.unshift(row);
+      } else {
+        for (let i = 0; i < this.selectList.length; i++) {
+          if (row.userId == this.selectList[i].userId) {
+            this.selectList.splice(i, 1);
+          }
+        }
+      }
+      this.$emit("getSelectList", this.selectList);
+    },
+    //表格全选事件
+    selectionRowAll(selection) {
+      if (selection.length) {
+        let list = selection;
+        for (let i = 0; i < list.length; i++) {
+          for (let j = 0; j < this.selectList.length; j++) {
+            if (list[i].userId == this.selectList[j].userId) {
+              this.selectList.splice(j, 1);
+            }
+          }
+        }
+        list.forEach((item) => {
+          this.selectList.unshift(item);
+        });
+      } else {
+        this.getList({ id: this.queryParams.deptId });
+        this.userList.forEach((item) => {
+          this.selectList.splice(this.selectList.indexOf(item), 1);
+        });
+      }
+      this.submit();
+    },
+    submit() {
+      this.$emit("getSelectList", this.selectList);
+    },
+    // 父组件关闭事件
+    parentHandleclick(e) {
+      this.$refs.checked.clearSelection();
+    },
+  },
+};
+</script>
+
+<style scoped>
+.app-containers ::-webkit-scrollbar {
+  display: none;
+}
+
+.one,
+.three,
+.two {
+  height: 510px;
+  width: 100%;
+  overflow: scroll;
+  border: solid 1px #dadada;
+}
+.one {
+  width: 95%;
+}
+.two {
+  border: 1px solid transparent;
+}
+.three {
+  width: 99%;
+  box-sizing: border-box;
+  margin-left: 5%;
+}
+.title {
+  line-height: 24px;
+  font-size: 18px;
+  color: #303133;
+  padding-bottom: 5px;
+  border-bottom: solid 1px #dadada;
+  margin-bottom: 15px;
+  margin-top: -23px;
+}
+.el-main,
+.smallmain {
+  padding: 0;
+}
+
+.smallHeader {
+  background-color: #1890ff;
+  position: relative;
+  color: #fff;
+  font-weight: 700;
+}
+.but1 {
+  position: absolute;
+  right: 20px;
+  top: 4px;
+}
+.open,
+.smallmain >>> .el-tree-node:focus > .el-tree-node__content {
+  background-color: #83bff8 !important;
+}
+.smallmain >>> .el-tree-node__content:hover {
+  background-color: #dadada;
+}
+.smallmain
+  >>> .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  background-color: #83bff8;
+}
+.tableBox >>> .el-table {
+  margin: 0;
+}
+.radio {
+  position: relative;
+}
+.nodata {
+  width: 100%;
+  text-align: center;
+  line-height: 40px;
+  height: 40px;
+}
+.tagBox {
+  width: 100%;
+}
+.tag {
+  width: 100%;
+  height: 38px;
+}
+.tagItem {
+  display: inline-block;
+  width: calc(100% / 3.2);
+  text-align: center;
+  margin-top: 5px;
+  /* 单行文本溢出省略号 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+::v-deep .el-tag .el-icon-close {
+  top: -9px;
+}
+.wrapBox >>> .el-table__body tr.current-row > td {
+  background-color: #83bff8 !important;
+}
+.wrapBox >>> .el-table tbody tr:hover > td {
+  background-color: #dadada;
+}
+::v-deep .el-tag {
+  margin-left: 0px;
+}
+</style>
diff --git a/src/views/deviceConsole/machine/index.vue b/src/views/deviceConsole/machine/index.vue
new file mode 100644
index 0000000..c16814d
--- /dev/null
+++ b/src/views/deviceConsole/machine/index.vue
@@ -0,0 +1,721 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="5"
+        ><div class="grid-content bg-purple">
+          <div class="grid-content three" style="height: 750px;border-radius: 10px">
+            <!-- 选择设备 -->
+            <el-container style="padding: 0">
+              <el-header
+                class="smallHeader"
+                style="height: 40px; line-height: 40px"
+                >选择设备
+              </el-header>
+              <el-main class="smallmain tableBox">
+                <p v-if="intelligent.length == 0" class="nodata">暂无数据</p>
+                <div class="tagBox" v-else>
+                  <el-button
+                    style="width: 100%"
+                    v-for="item in intelligent"
+                    :key="item"
+                    @click="handleClose(item)"
+                    >{{ item.machineryName }}</el-button
+                  >
+                </div>
+              </el-main>
+            </el-container>
+          </div>
+        </div></el-col
+      >
+      <el-col :span="18" class="myfont"
+        ><div class="content">
+          <div style="height: 100px">
+            <div style="width: 31px; margin-left: 9%">
+              <el-image
+                v-if="imgdata"
+                :src="img"
+                style="margin-top: 25px"
+              ></el-image>
+              <el-image v-else :src="imgs" style="margin-top: 25px"></el-image>
+            </div>
+          </div>
+          <div style="height: 440px">
+            <div style="height: 105px">
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 22%">
+                    {{ intelligentData.feedSpeed }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 25%">
+                    {{ intelligentData.spindleSpeed }}
+                  </div></el-col
+                >
+              </el-row>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="margin-top: 6px; height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 22%">
+                    {{ intelligentData.rapidOverride }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 25%">
+                    {{ intelligentData.spindle }}
+                  </div></el-col
+                >
+              </el-row>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="margin-top: 7px; height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 22%">
+                    {{ intelligentData.feedRate }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 25%">
+                    {{ intelligentData.handWheel }}
+                  </div></el-col
+                >
+              </el-row>
+            </div>
+
+            <div style="height: 158px">
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 60%">
+                    {{ intelligentData.relativeX }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 65%">
+                    {{ intelligentData.machineX }}
+                  </div></el-col
+                >
+              </el-row>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="margin-top: 10px; height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 60%">
+                    {{ intelligentData.relativeY }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 65%">
+                    {{ intelligentData.machineY }}
+                  </div></el-col
+                >
+              </el-row>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="margin-top: 15px; height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 60%">
+                    {{ intelligentData.relativeZ }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 65%">
+                    {{ intelligentData.machineZ }}
+                  </div></el-col
+                >
+              </el-row>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="margin-top: 12px; height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 60%">
+                    {{ intelligentData.relativeA }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 65%">
+                    {{ intelligentData.machineA }}
+                  </div></el-col
+                >
+              </el-row>
+            </div>
+
+            <div>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 60%">
+                    {{ intelligentData.absoluteX }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 65%">
+                    {{ intelligentData.residualX }}
+                  </div></el-col
+                >
+              </el-row>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="margin-top: 10px; height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 60%">
+                    {{ intelligentData.absoluteY }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 65%">
+                    {{ intelligentData.residualY }}
+                  </div></el-col
+                >
+              </el-row>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="margin-top: 15px; height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 60%">
+                    {{ intelligentData.absoluteZ }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 65%">
+                    {{ intelligentData.residualZ }}
+                  </div></el-col
+                >
+              </el-row>
+              <el-row
+                type="flex"
+                class="row-bg"
+                justify="center"
+                style="margin-top: 12px; height: 18px"
+              >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 60%">
+                    {{ intelligentData.absoluteA }}
+                  </div></el-col
+                >
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple" style="margin-left: 65%">
+                    {{ intelligentData.residualA }}
+                  </div></el-col
+                >
+              </el-row>
+            </div>
+          </div>
+          <div style="height: 350px">
+            <el-row
+              type="flex"
+              class="row-bg"
+              justify="center"
+              style="margin-bottom: 15px; height: 50px"
+            >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 40%">
+                  <!-- {{1}} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 20%"
+                >
+                  <!-- {{ 2 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 35%">
+                  <!-- {{ 3 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 8%"
+                >
+                  <!-- {{ 4 }} -->
+                </div></el-col
+              >
+            </el-row>
+
+            <el-row
+              type="flex"
+              class="row-bg"
+              justify="center"
+              style="margin-bottom: 15px; height: 50px"
+            >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 40%">
+                  <!-- {{ 1 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 20%"
+                >
+                  <!-- {{ 2 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 35%">
+                  <!-- {{ 3 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 8%"
+                >
+                  <!-- {{ 4 }} -->
+                </div></el-col
+              >
+            </el-row>
+            <el-row
+              type="flex"
+              class="row-bg"
+              justify="center"
+              style="margin-bottom: 15px; height: 50px"
+            >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 40%">
+                  <!-- {{ 1 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 20%"
+                >
+                  <!-- {{ 2 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 35%">
+                  <!-- {{ 3 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 8%"
+                >
+                  <!-- {{ 4 }} -->
+                </div></el-col
+              >
+            </el-row>
+            <el-row
+              type="flex"
+              class="row-bg"
+              justify="center"
+              style="margin-bottom: 15px; height: 50px"
+            >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 40%">
+                  <!-- {{ 1 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 20%"
+                >
+                  <!-- {{ 2 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 35%">
+                  <!-- {{ 3 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 8%"
+                >
+                  <!-- {{ 4 }} -->
+                </div></el-col
+              >
+            </el-row>
+
+            <el-row
+              type="flex"
+              class="row-bg"
+              justify="center"
+              style="margin-bottom: 15px; height: 50px"
+            >
+              <el-col :span="6"
+                ><div class="grid-content bg-purple" style="margin-left: 40%">
+                  <!-- {{ 1 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 20%"
+                >
+                  <!-- {{ 2 }} -->
+                </div></el-col
+              >
+              <el-col :span="6"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 35%"
+                ></div
+              ></el-col>
+              <el-col :span="12"
+                ><div
+                  class="grid-content bg-purple-light"
+                  style="margin-left: 59%"
+                >
+                  <el-button
+                    type="danger"
+                    style="margin-top: 17%; height: 40px"
+                    @click="off"
+                  ></el-button>
+                  <el-button
+                    type="success"
+                    style="margin-top: 17%; height: 40px; margin-left: 18%"
+                    @click="on"
+                  ></el-button></div
+              ></el-col>
+            </el-row>
+          </div></div
+      ></el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { listMachinery } from "@/api/mes/dv/machinery";
+import { listMachinerytype } from "@/api/mes/dv/machinerytype";
+import axios from "axios";
+import "@/assets/font/font.css";
+export default {
+  data() {
+    return {
+      intelligent: [],
+      intelligentData: {},
+      // 遮罩层
+      loading: true,
+      id: "",
+      imgdata: true,
+      timer: null,
+      img: require("../../../assets/images/close.png"),
+      imgs: require("../../../assets/images/open.png"),
+      machineryTypeOptions: [],
+      machinerydata: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "",
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  mounted() {
+    // 定时刷新
+    this.timer = setInterval(() => {
+      if (this.id != "") {
+        this.setInterval();
+      }
+    }, 1500);
+    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(this.timer);
+    });
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // axios
+      //   .get("http://192.168.50.191:8077/manage/device/devices")
+      //   .then((res) => {
+      //     this.intelligent = res.data.data;
+      //     this.loading = false;
+      //   });
+
+      listMachinerytype().then((response) => {
+        var data = "";
+        response.data.forEach((item) => {
+          if (item.machineryTypeCode == "M_TYPE_001") {
+            data = item.machineryTypeId;
+          }
+        });
+        this.machinerydata.machineryTypeId = data;
+        this.listMachineryitem();
+      });
+    },
+
+    listMachineryitem() {
+      listMachinery(this.machinerydata).then((response) => {
+        response.rows.forEach((item) => {
+          if (item.ip != null) {
+            this.intelligent.push(item);
+          }
+        });
+        this.loading = false;
+      });
+    },
+
+    handleClose(item) {
+      this.id = item.machineryId;
+      this.setInterval();
+    },
+
+    setInterval() {
+      axios
+        .get("http://192.168.50.191:8077/manage/modbus/data", {
+          params: {
+            id: this.id,
+          },
+        })
+        .then((res) => {
+          this.intelligentData = res.data.data;
+        });
+    },
+
+    off() {
+      if (this.id != "") {
+        axios
+          .get("http://192.168.50.191:8077/manage/modbus/operate", {
+            params: {
+              id: this.id,
+              type: 2,
+            },
+          })
+          .then((res) => {
+            this.imgdata = true;
+            this.$modal.msgSuccess("停止成功");
+          });
+      } else {
+        this.$message({
+          message: "请选择设备",
+          type: "warning",
+        });
+      }
+    },
+    on() {
+      if (this.id != "") {
+        axios
+          .get("http://192.168.50.191:8077/manage/modbus/operate", {
+            params: {
+              id: this.id,
+              type: 1,
+            },
+          })
+          .then((res) => {
+            this.imgdata = false;
+            this.$modal.msgSuccess("启动成功");
+          });
+      } else {
+        this.$message({
+          message: "请选择设备",
+          type: "warning",
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.myfont {
+  font-family: "Ayuthaya"; // 这里的 Ayuthaya 是引入时的自定义名字
+}
+::-webkit-scrollbar {
+  width: 0 !important;
+}
+::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0;
+}
+
+.el-button + .el-button {
+  margin-left: 0px !important;
+}
+
+.app-containers ::-webkit-scrollbar {
+  display: none;
+}
+
+.image {
+  width: 300px;
+  height: 200px;
+}
+
+.one,
+.three,
+.two {
+  height: 510px;
+  width: 100%;
+  overflow: scroll;
+  border: solid 1px #dadada;
+}
+.one {
+  width: 95%;
+}
+.two {
+  border: 1px solid transparent;
+}
+.three {
+  width: 99%;
+  box-sizing: border-box;
+  margin-left: 5%;
+}
+.title {
+  line-height: 24px;
+  font-size: 18px;
+  color: #302933;
+  padding-bottom: 5px;
+  border-bottom: solid 1px #dadada;
+  margin-bottom: 15px;
+  margin-top: -23px;
+}
+.el-main,
+.smallmain {
+  padding: 0;
+}
+
+.smallHeader {
+  background-color: #e0e8f0;
+  position: relative;
+  color: #7a8289;
+  font-weight: 700;
+}
+.content {
+  position: relative;
+  width: 70%;
+  margin: 0 auto 20px;
+  background: url("../../../assets/images/machine.png") no-repeat center;
+  background-size: 100% 100%;
+}
+
+.but1 {
+  position: absolute;
+  right: 20px;
+  top: 4px;
+}
+.open,
+.smallmain >>> .el-tree-node:focus > .el-tree-node__content {
+  background-color: #83bff8 !important;
+}
+.smallmain >>> .el-tree-node__content:hover {
+  background-color: #dadada;
+}
+.smallmain
+  >>> .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  background-color: #83bff8;
+}
+.tableBox >>> .el-table {
+  margin: 0;
+}
+.radio {
+  position: relative;
+}
+.nodata {
+  width: 100%;
+  text-align: center;
+  line-height: 40px;
+  height: 40px;
+}
+.tagBox {
+  width: 100%;
+}
+.tag {
+  width: 100%;
+  height: 38px;
+}
+.tagItem {
+  display: inline-block;
+  width: calc(100% / 3.2);
+  text-align: center;
+  margin-top: 5px;
+  /* 单行文本溢出省略号 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+::v-deep .el-tag .el-icon-close {
+  top: -9px;
+}
+.wrapBox >>> .el-table__body tr.current-row > td {
+  background-color: #83bff8 !important;
+}
+.wrapBox >>> .el-table tbody tr:hover > td {
+  background-color: #dadada;
+}
+::v-deep .el-tag {
+  margin-left: 0px;
+}
+</style>
diff --git a/src/views/deviceConsole/robotic/index.vue b/src/views/deviceConsole/robotic/index.vue
new file mode 100644
index 0000000..bc4a9c8
--- /dev/null
+++ b/src/views/deviceConsole/robotic/index.vue
@@ -0,0 +1,553 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="4"
+        ><div class="grid-content bg-purple">
+          <div
+            class="grid-content three"
+            style="height: 750px; border-radius: 10px"
+          >
+            <!-- 选择设备 -->
+            <el-container style="padding: 0">
+              <el-header
+                class="smallHeader"
+                style="height: 40px; line-height: 40px"
+                >选择设备
+              </el-header>
+              <el-main class="smallmain tableBox">
+                <p v-if="intelligent.length == 0" class="nodata">暂无数据</p>
+                <div class="tagBox" v-else>
+                  <el-button
+                    style="width: 100%"
+                    v-for="item in intelligent"
+                    :key="item"
+                    @click="handleClose(item)"
+                    >{{ item.machineryName }}</el-button
+                  >
+                </div>
+              </el-main>
+            </el-container>
+          </div>
+        </div></el-col
+      >
+      <el-col :span="14"
+        ><div class="grid-content bg-purple">
+          <div>
+            <el-image :src="img"></el-image>
+          </div>
+          <div
+            style="
+              border: 1px solid rgb(217 216 216);
+              height: 60px;
+              width: 30%;
+              border-radius: 30px;
+              margin-left: 32%;
+            "
+          >
+            <p
+              v-if="Powersupply"
+              style="
+                font-size: 20px;
+                color: rgb(158, 158, 158);
+                margin: 19px;
+                text-align: center;
+              "
+            >
+              Power down
+            </p>
+            <p
+              v-else
+              style="
+                font-size: 20px;
+                color: rgb(158, 158, 158);
+                margin: 19px;
+                text-align: center;
+              "
+            >
+              Power on
+            </p>
+          </div>
+          <div
+            style="
+              border: 1px solid rgb(217, 216, 216);
+              height: 100px;
+              width: 30%;
+              border-radius: 50px;
+              margin-left: 32%;
+              margin-top: 2%;
+              background: rgba(204, 204, 221, 0.2);
+            "
+          >
+            <p
+              style="
+                font-size: 14px;
+                color: rgb(158, 158, 158);
+                margin: 0px;
+                text-align: center;
+              "
+            >
+              Control
+            </p>
+            <div style="margin-top: 2%">
+              <el-row type="flex" class="row-bg" justify="center">
+                <el-col :span="4"
+                  ><div class="grid-content bg-purple">
+                    <div v-if="elimage">
+                      <el-button @click="upbutton"
+                        ><el-image
+                          :src="sd"
+                          style="width: 20px; height: 20px"
+                        ></el-image
+                      ></el-button>
+                      <p
+                        style="
+                          margin: auto;
+                          margin-left: 25%;
+                          font-size: 14px;
+                          color: #9e9e9e;
+                        "
+                      >
+                        上电
+                      </p>
+                    </div>
+                    <div v-else>
+                      <el-button @click="downbutton">
+                        <el-image
+                          :src="xd"
+                          style="width: 20px; height: 20px"
+                        ></el-image>
+                      </el-button>
+                      <p
+                        style="
+                          margin: auto;
+                          margin-left: 25%;
+                          font-size: 14px;
+                          color: #9e9e9e;
+                        "
+                      >
+                        下电
+                      </p>
+                    </div>
+                  </div></el-col
+                >
+                <el-col :span="6"
+                  ><div class="grid-content bg-purple-light"></div
+                ></el-col>
+                <el-col :span="5"
+                  ><div class="grid-content bg-purple">
+                    <div>
+                      <el-button>
+                        <el-image
+                          :src="fw"
+                          style="width: 20px; height: 20px"
+                        ></el-image>
+                      </el-button>
+                      <p
+                        style="
+                          margin: auto;
+                          margin-left: 25%;
+                          font-size: 14px;
+                          color: #9e9e9e;
+                        "
+                      >
+                        复位
+                      </p>
+                    </div>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+        </div></el-col
+      >
+      <el-col :span="5"
+        ><div class="grid-content bg-purple">
+          <div
+            class="grid-content three"
+            style="width: 330px; height: 335px; border-radius: 10px"
+          >
+            <el-header
+              class="smallHeader"
+              style="height: 40px; line-height: 40px"
+              >Robot Operation Panel
+            </el-header>
+            <div style="margin: 6px">
+              <el-radio-group
+                v-model="radio4"
+                size="mini"
+                style="display: flex"
+              >
+                <el-radio-button :label="1">j1轴</el-radio-button>
+                <el-radio-button :label="2">j2轴</el-radio-button>
+                <el-radio-button :label="3">j3轴</el-radio-button>
+                <el-radio-button :label="4">j4轴</el-radio-button>
+                <el-radio-button :label="5">j5轴</el-radio-button>
+                <el-radio-button :label="6">j6轴</el-radio-button>
+              </el-radio-group>
+            </div>
+            <div
+              style="
+                width: 90%;
+                height: 120px;
+                margin: auto;
+                border-radius: 10px;
+                box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+              "
+            >
+              <el-header
+                class="smallHeader"
+                style="height: 30px; line-height: 30px"
+                >Coordinate
+              </el-header>
+              <div style="margin: 20px 10px">
+                <el-row type="flex" class="row-bg" justify="space-around">
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple"
+                      style="text-align: center"
+                    >
+                      X:{{ 123 }}
+                    </div></el-col
+                  >
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple-light"
+                      style="text-align: center"
+                    >
+                      Y:{{ 123 }}
+                    </div></el-col
+                  >
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple"
+                      style="text-align: center"
+                    >
+                      Z:{{ 123 }}
+                    </div></el-col
+                  >
+                </el-row>
+              </div>
+              <div style="margin: 20px 10px">
+                <el-row type="flex" class="row-bg" justify="space-around">
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple"
+                      style="text-align: center"
+                    >
+                      A:{{ 123 }}
+                    </div></el-col
+                  >
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple-light"
+                      style="text-align: center"
+                    >
+                      B:{{ 123 }}
+                    </div></el-col
+                  >
+                  <el-col :span="6"
+                    ><div
+                      class="grid-content bg-purple"
+                      style="text-align: center"
+                    >
+                      C:{{ 123 }}
+                    </div></el-col
+                  >
+                </el-row>
+              </div>
+            </div>
+            <div
+              style="
+                width: 90%;
+                height: 88px;
+                margin: auto;
+                margin-top: 20px;
+                border-radius: 10px;
+                box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+              "
+            >
+              <el-header
+                class="smallHeader"
+                style="height: 30px; line-height: 30px"
+              >
+                Standard
+              </el-header>
+              <div style="margin: 20px 20px">Speed limit:{{ 1 }}</div>
+            </div>
+          </div>
+        </div></el-col
+      >
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { listMachinery } from "@/api/mes/dv/machinery";
+import { listMachinerytype } from "@/api/mes/dv/machinerytype";
+import axios from "axios";
+export default {
+  data() {
+    return {
+      intelligent: [],
+      intelligentData: {},
+      // 遮罩层
+      loading: true,
+      id: "",
+      imgdata: true,
+      timer: null,
+      machineryTypeOptions: [],
+      machinerydata: {
+        pageNum: 1,
+        pageSize: 10,
+        machineryTypeId: "",
+      },
+      elimage: true,
+      Powersupply: true,
+      radio4: "1",
+      img: require("../../../assets/images/robotic.png"),
+      sd: require("../../../assets/images/shangdian.png"),
+      xd: require("../../../assets/images/weishangdian.png"),
+      fw: require("../../../assets/images/fuwei-02.png"),
+    };
+  },
+  created() {
+    this.getList();
+  },
+  mounted() {
+    // 定时刷新
+    this.timer = setInterval(() => {
+      if (this.id != "") {
+        this.setInterval();
+      }
+    }, 1500);
+    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(this.timer);
+    });
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      listMachinerytype().then((response) => {
+        var data = "";
+        response.data.forEach((item) => {
+          if (item.machineryTypeCode == "M_TYPE_002") {
+            data = item.machineryTypeId;
+          }
+        });
+        this.machinerydata.machineryTypeId = data;
+        this.listMachineryitem();
+      });
+    },
+
+    listMachineryitem() {
+      listMachinery(this.machinerydata).then((response) => {
+        response.rows.forEach((item) => {
+          if (item.ip != null) {
+            this.intelligent.push(item);
+          }
+        });
+        this.loading = false;
+      });
+    },
+
+    handleClose(item) {
+      this.id = item.machineryId;
+      this.setInterval();
+    },
+
+    setInterval() {
+      // axios
+      //   .get("http://192.168.50.191:8077/manage/modbus/data", {
+      //     params: {
+      //       id: this.id,
+      //     },
+      //   })
+      //   .then((res) => {
+      //     this.intelligentData = res.data.data;
+      //   });
+    },
+
+    upbutton() {
+      if (this.id != "") {
+        axios
+          .get("http://192.168.50.191:8077/manage/robot/powerOn", {
+            params: {
+              id: this.id,
+            },
+          })
+          .then((res) => {
+            if (res.data.code === 200) {
+              this.elimage = false;
+              this.Powersupply = false;
+              this.$modal.msgSuccess("上电成功");
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+      } else {
+        this.$message({
+          message: "请选择设备",
+          type: "warning",
+        });
+      }
+    },
+
+    downbutton() {
+      if (this.id != "") {
+        axios
+          .get("http://192.168.50.191:8077/manage/robot/powerOff", {
+            params: {
+              id: this.id,
+            },
+          })
+          .then((res) => {
+            if (res.data.code === 200) {
+              this.elimage = true;
+              this.Powersupply = true;
+              this.$modal.msgSuccess("下电成功");
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+      } else {
+        this.$message({
+          message: "请选择设备",
+          type: "warning",
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-containers ::-webkit-scrollbar {
+  display: none;
+}
+
+::-webkit-scrollbar {
+  width: 0 !important;
+}
+::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0;
+}
+
+.el-button + .el-button {
+  margin-left: 0px !important;
+}
+
+.image {
+  width: 300px;
+  height: 200px;
+}
+
+.one,
+.three,
+.two {
+  height: 510px;
+  width: 100%;
+  overflow: scroll;
+  border: solid 1px #dadada;
+}
+.one {
+  width: 95%;
+}
+.two {
+  border: 1px solid transparent;
+}
+.three {
+  width: 99%;
+  box-sizing: border-box;
+  margin-left: 5%;
+}
+.title {
+  line-height: 24px;
+  font-size: 18px;
+  color: #302933;
+  padding-bottom: 5px;
+  border-bottom: solid 1px #dadada;
+  margin-bottom: 15px;
+  margin-top: -23px;
+}
+.el-main,
+.smallmain {
+  padding: 0;
+}
+
+.smallHeader {
+  background-color: #e0e8f0;
+  position: relative;
+  color: #7a8289;
+  font-weight: 700;
+}
+.content {
+  position: relative;
+  width: 70%;
+  margin: 0 auto 20px;
+  background: url("../../../assets/images/machine.png") no-repeat center;
+  background-size: 100% 100%;
+}
+
+.but1 {
+  position: absolute;
+  right: 20px;
+  top: 4px;
+}
+.open,
+.smallmain >>> .el-tree-node:focus > .el-tree-node__content {
+  background-color: #83bff8 !important;
+}
+.smallmain >>> .el-tree-node__content:hover {
+  background-color: #dadada;
+}
+.smallmain
+  >>> .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  background-color: #83bff8;
+}
+.tableBox >>> .el-table {
+  margin: 0;
+}
+.radio {
+  position: relative;
+}
+.nodata {
+  width: 100%;
+  text-align: center;
+  line-height: 40px;
+  height: 40px;
+}
+.tagBox {
+  width: 100%;
+}
+.tag {
+  width: 100%;
+  height: 38px;
+}
+.tagItem {
+  display: inline-block;
+  width: calc(100% / 3.2);
+  text-align: center;
+  margin-top: 5px;
+  /* 单行文本溢出省略号 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+::v-deep .el-tag .el-icon-close {
+  top: -9px;
+}
+.wrapBox >>> .el-table__body tr.current-row > td {
+  background-color: #83bff8 !important;
+}
+.wrapBox >>> .el-table tbody tr:hover > td {
+  background-color: #dadada;
+}
+::v-deep .el-tag {
+  margin-left: 0px;
+}
+</style>
diff --git a/src/views/index.vue b/src/views/index.vue
index 956eff6..36e8cd9 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,51 +1,93 @@
 <template>
   <div class="dashboard-editor-container">
-
     <panel-group @handleSetLineChartData="handleSetLineChartData" />
 
-    <el-row :gutter="32" style="padding:16px 16px 0;margin-bottom:32px;">
-        <el-card>
-            <div slot="header" class="clearfix">
-                <span>生产进度</span>
-            </div>
-            <el-table
-                v-loading="loading"
-                :data="workorderList"
-                row-key="workorderId"
-                default-expand-all
-                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-                >
-                <el-table-column label="工单编码" width="180" prop="workorderCode" >
-                    <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="text"
-                        @click="handleView(scope.row)"
-                        v-hasPermi="['mes:pro:workorder:query']"
-                    >{{scope.row.workorderCode}}</el-button>
-                    </template>
-                </el-table-column>
-                <el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />            
-                <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
-                <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
-                <el-table-column label="产品名称" width="250px" align="center" prop="productName" :show-overflow-tooltip="true"/>
-                <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
-                <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-                <el-table-column label="生产进度" align="center" width="200px" >
-                    <template slot-scope="scope">
-                        <el-progress :text-inside="true" :stroke-width="20" :percentage="parseFloat(((scope.row.quantityProduced/scope.row.quantity*100).toFixed(2)))"></el-progress>
-                    </template>
-                </el-table-column>            
-                <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
-                    <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                </el-table-column>         
-            </el-table>
-        </el-card>
+    <el-row :gutter="32" style="padding: 16px 16px 0; margin-bottom: 32px">
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>生产进度</span>
+        </div>
+        <el-table
+          v-loading="loading"
+          :data="workorderList"
+          row-key="workorderId"
+          default-expand-all
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        >
+          <el-table-column label="工单编码" width="180" prop="workorderCode">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleView(scope.row)"
+                v-hasPermi="['mes:pro:workorder:query']"
+                >{{ scope.row.workorderCode }}</el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="订单编号"
+            width="140"
+            align="center"
+            prop="sourceCode"
+          />
+          <el-table-column
+            label="客户名称"
+            align="center"
+            prop="clientName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="产品编号"
+            width="120"
+            align="center"
+            prop="productCode"
+          />
+          <el-table-column
+            label="产品名称"
+            width="250px"
+            align="center"
+            prop="productName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="规格型号"
+            align="center"
+            prop="productSpc"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+          <el-table-column label="生产进度" align="center" width="200px">
+            <template slot-scope="scope">
+              <el-progress
+                :text-inside="true"
+                :stroke-width="20"
+                :percentage="
+                  parseFloat(
+                    (
+                      (scope.row.quantityProduced / scope.row.quantity) *
+                      100
+                    ).toFixed(2)
+                  )
+                "
+              ></el-progress>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="需求日期"
+            align="center"
+            prop="requestDate"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
     </el-row>
-    
-    <el-row style="background:#fff;padding:16px 16px 0; margin-bottom:32px;">
+
+    <el-row style="background: #fff; padding: 16px 16px 0; margin-bottom: 32px">
       <line-chart :chart-data="lineChartData" />
     </el-row>
 
@@ -66,71 +108,69 @@
         </div>
       </el-col>
     </el-row>
-
-    
   </div>
 </template>
 
 <script>
 import { listWorkorder } from "@/api/mes/pro/workorder";
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
+import PanelGroup from "./dashboard/PanelGroup";
+import LineChart from "./dashboard/LineChart";
+import RaddarChart from "./dashboard/RaddarChart";
+import PieChart from "./dashboard/PieChart";
+import BarChart from "./dashboard/BarChart";
 
 const lineChartData = {
   newVisitis: {
     expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
+    actualData: [120, 82, 91, 154, 162, 140, 145],
   },
   messages: {
     expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
+    actualData: [180, 160, 151, 106, 145, 150, 130],
   },
   purchases: {
     expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
+    actualData: [120, 90, 100, 138, 142, 130, 130],
   },
   shoppings: {
     expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
+    actualData: [120, 82, 91, 154, 162, 140, 130],
+  },
+};
 
 export default {
-  name: 'Index',
+  name: "Index",
   components: {
     PanelGroup,
     LineChart,
     RaddarChart,
     PieChart,
-    BarChart
+    BarChart,
   },
   data() {
     return {
-        loading: true,
-        queryParams: {status:'CONFIRMED'},
-        workorderList: [],
-        lineChartData: lineChartData.newVisitis
-    }
+      loading: true,
+      queryParams: {},
+      workorderList: [],
+      lineChartData: lineChartData.newVisitis,
+    };
   },
-  created(){
-      this.getList();
+  created() {
+    this.getList();
   },
   methods: {
     getList() {
       this.loading = true;
-      listWorkorder(this.queryParams).then(response => {
-        this.workorderList = response.rows;
+      listWorkorder(this.queryParams).then((response) => {
+        this.workorderList = response.data;
         this.loading = false;
       });
     },
     handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
-    }
-  }
-}
+      this.lineChartData = lineChartData[type];
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -146,7 +186,7 @@ export default {
   }
 }
 
-@media (max-width:1024px) {
+@media (max-width: 1024px) {
   .chart-wrapper {
     padding: 8px;
   }
diff --git a/src/views/login.vue b/src/views/login.vue
index 0935efa..1ab3897 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,119 +1,272 @@
 <template>
-  <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">苦糖果生产执行管理系统</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaOnOff">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">      
-      <span @click="toIPC">陕ICP备2022002135号-1</span>
+  <div class="login-container ng-scope">
+    <div class="login-wrap">
+      <div class="bg-opacity">
+        <div class="logo" />
+        <div class="title" />
+      </div>
+      <el-card class="card-container">
+        <el-tabs type="card" :tab-position="tabPosition" style="height: 350px">
+          <el-tab-pane>
+            <span slot="label" style="width: 248px"
+              ><i class="el-icon-user" /> 账号登录</span
+            >
+            <el-form
+              ref="loginForm"
+              :model="loginForm"
+              :rules="loginRules"
+              class="login-form"
+              autocomplete="on"
+              label-position="left"
+            >
+              <div class="title-container">
+                <h1 class="title">登录</h1>
+              </div>
+              <el-form-item prop="username">
+                <span class="svg-container">
+                  <svg-icon icon-class="user" />
+                </span>
+                <el-input
+                  ref="username"
+                  v-model="loginForm.username"
+                  placeholder="请输入账号"
+                  name="username"
+                  type="text"
+                  tabindex="1"
+                  auto-complete="on"
+                />
+              </el-form-item>
+              <el-tooltip
+                v-model="capsTooltip"
+                content="密码明文查看"
+                placement="right"
+                manual
+              >
+                <el-form-item prop="password">
+                  <span class="svg-container">
+                    <svg-icon icon-class="password" />
+                  </span>
+                  <el-input
+                    :key="passwordType"
+                    ref="password"
+                    v-model="loginForm.password"
+                    :type="passwordType"
+                    placeholder="请填写密码"
+                    name="password"
+                    tabindex="2"
+                    autocomplete="on"
+                    @keyup.native="checkCapslock"
+                    @blur="capsTooltip = false"
+                  />
+                  <span class="show-pwd" @click="showPwd">
+                    <svg-icon
+                      :icon-class="
+                        passwordType === 'password' ? 'eye' : 'eye-open'
+                      "
+                    />
+                  </span>
+                </el-form-item>
+              </el-tooltip>
+              <el-checkbox
+                v-model="loginForm.rememberMe"
+                style="margin: 0px 76px 0px -155px"
+                >记住密码</el-checkbox
+              >
+              <el-button type="primary" @click.native.prevent="handleLogin"
+                >登 录</el-button
+              >
+
+              <!-- <span style="font-size:13px;cursor:pointer;color:#9b9ea0;text-decoration:none;position: absolute;right:20px;padding-top:20px;" @click="forgetPwd">忘记密码</span> -->
+              <!-- <el-row>
+                <el-col :span="24" style="text-align:right;margin-top:-20px"><span style="font-size:13px;cursor:pointer;color:#9b9ea0;text-decoration:none" @click="forgetPwd">忘记密码</span></el-col>
+              </el-row> -->
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane>
+            <span slot="label" style="width: 249px"
+              ><i class="el-icon-phone" /> 手机号登录</span
+            >
+            <el-form
+              ref="loginForm"
+              :model="loginForm"
+              :rules="loginPhoneRules"
+              class="login-form"
+              autocomplete="on"
+              label-position="left"
+            >
+              <div class="title-container">
+                <h1 class="title">登录</h1>
+              </div>
+              <el-form-item prop="username">
+                <span class="svg-container">
+                  <img
+                    src="@/assets/images/shoujitianchong.png"
+                    class="svgImg"
+                  />
+                </span>
+                <el-input
+                  ref="phone"
+                  v-model="loginForm.username"
+                  placeholder="请输入手机号码"
+                  name="phone"
+                  type="text"
+                  tabindex="1"
+                  auto-complete="on"
+                />
+              </el-form-item>
+              <el-tooltip
+                v-model="capsTooltip"
+                content="密码明文查看"
+                placement="right"
+                manual
+              >
+                <el-form-item prop="password">
+                  <span class="svg-container">
+                    <svg-icon icon-class="password" />
+                  </span>
+                  <el-input
+                    :key="passwordType"
+                    ref="password"
+                    v-model="loginForm.password"
+                    :type="passwordType"
+                    placeholder="请填写密码"
+                    name="password"
+                    tabindex="2"
+                    autocomplete="on"
+                    @keyup.native="checkCapslock"
+                    @blur="capsTooltip = false"
+                  />
+                  <span class="show-pwd" @click="showPwd">
+                    <svg-icon
+                      :icon-class="
+                        passwordType === 'password' ? 'eye' : 'eye-open'
+                      "
+                    />
+                  </span>
+                </el-form-item>
+              </el-tooltip>
+              <el-checkbox
+                v-model="loginForm.rememberMe"
+                style="margin: 0px 76px 0px -155px"
+                >记住密码</el-checkbox
+              >
+              <el-button type="primary" @click.native.prevent="handleLogin"
+                >登 录</el-button
+              >
+
+              <!-- <span style="font-size:13px;cursor:pointer;color:#9b9ea0;text-decoration:none;position: absolute;right:20px;padding-top:20px;" @click="forgetPwd">忘记密码</span> -->
+
+              <!-- <el-row>
+                <el-col :span="24" style="text-align:right;margin-top:-20px">
+                  <span style="font-size:13px;cursor:pointer;color:#9b9ea0;text-decoration:none" @click="forgetPwd">忘记密码</span></el-col>
+              </el-row> -->
+            </el-form>
+          </el-tab-pane>
+        </el-tabs>
+      </el-card>
     </div>
+    <el-dialog
+      title="忘记密码"
+      :visible.sync="dialogVisible"
+      width="30%"
+      append-to-body
+      center
+    >
+      <p>机构员工遗失密码，请联系本机构管理员进行密码重置；</p>
+      <p>
+        机构管理员遗失密码，请联系平台客服，QQ：2546125360，并提供相关身份证明材料。
+      </p>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+    <Footer />
   </div>
 </template>
 
 <script>
+import Footer from "@/components/Footer";
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { encrypt, decrypt } from "@/utils/jsencrypt";
 
 export default {
+  components: { Footer },
   name: "Login",
   data() {
     return {
-      codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
       },
+      loginPhoneForm: {
+        phone: "",
+        password: "",
+      },
+      tabPosition: "",
       loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+          { required: true, trigger: "blur", message: "请输入用户名称" },
         ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        password: [{ required: true, trigger: "blur", message: "请录入密码" }],
       },
+      loginPhoneRules: {
+        username: [{ required: true, trigger: "blur", message: "请输入手机号码" }],
+        // username: [
+        //   { required: true, message: "手机号码不能为空", trigger: "blur" },
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "请输入正确的手机号码",
+        //     trigger: "blur",
+        //   },
+        // ],
+        password: [{ required: true, trigger: "blur", message: "请录入密码" }],
+      },
+      passwordType: "password",
+      capsTooltip: false,
       loading: false,
-      // 验证码开关
-      captchaOnOff: true,
-      // 注册开关
-      register: false,
-      redirect: undefined
+      redirect: undefined,
+      otherQuery: {},
+      dialogVisible: false,
     };
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect;
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
     this.getCode();
     this.getCookie();
   },
+  mounted() {
+    if (this.loginForm.username === "") {
+      this.$refs.username.focus();
+    } else if (this.loginForm.password === "") {
+      this.$refs.password.focus();
+    }
+    window.addEventListener("keydown", this.keyDown); //监听回车事件
+  },
+  destroyed() {
+    window.removeEventListener("keydown", this.keyDown, false); //销毁回车事件，如果不销毁，在其他页面敲回车也会执行回车登录操作。
+  },
   methods: {
-    toIPC(){
-      window.open("https://beian.miit.gov.cn/","_blank");
+    toIPC() {
+      window.open("https://beian.miit.gov.cn/", "_blank");
     },
     getCode() {
-      getCodeImg().then(res => {
-        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
+      getCodeImg().then((res) => {
+        this.captchaOnOff =
+          res.captchaOnOff === undefined ? true : res.captchaOnOff;
         if (this.captchaOnOff) {
           this.codeUrl = "data:image/gif;base64," + res.img;
           this.loginForm.uuid = res.uuid;
@@ -123,100 +276,344 @@ export default {
     getCookie() {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
+      const rememberMe = Cookies.get("rememberMe");
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
       };
     },
+    checkCapslock(e) {
+      const { key } = e;
+      this.capsTooltip = key && key.length === 1 && key >= "A" && key <= "Z";
+    },
+    showPwd() {
+      if (this.passwordType === "password") {
+        this.passwordType = "";
+      } else {
+        this.passwordType = "password";
+      }
+      this.$nextTick(() => {
+        this.$refs.password.focus();
+      });
+    },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
             Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, {
+              expires: 30,
+            });
           } else {
             Cookies.remove("username");
             Cookies.remove("password");
-            Cookies.remove('rememberMe');
+            Cookies.remove("rememberMe");
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaOnOff) {
-              this.getCode();
-            }
-          });
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaOnOff) {
+                this.getCode();
+              }
+            });
         }
       });
-    }
-  }
+    },
+    phoneLogin() {
+      // this.$refs.loginPhoneForm.validate((valid) => {
+      //   if (valid) {
+      //     this.loading = true;
+      //     this.$store
+      //       .dispatch("user/phoneLogin", this.loginPhoneForm)
+      //       .then(() => {
+      //         debugger;
+      //         this.$router.push({ path: "/", query: this.otherQuery });
+      //         this.loading = false;
+      //       })
+      //       .catch(() => {
+      //         this.loading = false;
+      //       });
+      //   } else {
+      //     console.log("error submit!!");
+      //     return false;
+      //   }
+      // });
+    },
+  },
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
-.login {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
-}
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+<style lang="scss">
+$bg: #fff;
+$light_gray: #000;
+$cursor: #858585;
+
+@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
+  .login-container .el-input input {
+    color: $cursor;
+    line-height: 44px;
+  }
 }
 
-.login-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+/* reset element-ui css */
+.login-container {
   .el-input {
-    height: 38px;
+    display: inline-block;
+    height: 44px;
+    width: 85%;
+
     input {
-      height: 38px;
+      background: transparent;
+      border: 0px;
+      -webkit-appearance: none;
+      border-radius: 0px;
+      padding: 6px 5px 12px 15px;
+      border-bottom: 1px solid #e0e0e0;
+      color: $light_gray;
+      height: 44px;
+      caret-color: $cursor;
+
+      &:-webkit-autofill {
+        box-shadow: 0 0 0px 1000px $bg inset !important;
+        -webkit-text-fill-color: $cursor !important;
+      }
     }
   }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
+
+  .el-form-item {
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    // background: rgba(0, 0, 0, 0.1);
+    border-radius: 5px;
+    color: #454545;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+$bg: #2d3a4b;
+$dark_gray: rgb(29, 27, 27);
+$light_gray: #eee;
+
+.login-container {
+  height: 65%;
+  width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  background: url("../../src/assets/images/login_bg.jpg") no-repeat center;
+  background-size: 100%;
+  content: "";
+  z-index: 0;
+
+  .bg-opacity {
+    padding-bottom: 10px;
+    background-color: rgba(0, 0, 0, 0.3);
+  }
+  .logo {
+    position: relative;
+    width: 25%;
+    height: 140px;
+    margin: 0 auto 20px;
+    background: url("../../src/assets/images/logo_white.png") no-repeat center;
+    background-size: 100% 100%;
+  }
+  .logo:after {
+    position: absolute;
+    content: "";
+    left: -15%;
+    bottom: 0;
+    height: 1px;
+    width: 129%;
+    border-bottom: 1px solid #fff;
+  }
+  .logo + .title {
+    width: 666px;
+    height: 44px;
+    margin: 0 auto;
+    background: url("../../src/assets/images/login_title.png") no-repeat center;
+    background-size: 100% 100%;
+    color: white;
+    // font-size: 24px;
+    // letter-spacing: 4px
+  }
+  .login-content {
+    overflow: hidden;
+    height: 100%;
+  }
+
+  .card-container {
+    width: 500px;
+    margin: 0 auto;
+    padding: 0 auto;
+  }
+  .el-card {
+    // padding: 5px 10px 0px 0px;
+    padding: 0px;
+  }
+  ::v-deep .el-card__body {
+    padding: 0px !important;
+    .el-tabs__item {
+      width: 250px;
+    }
+  }
+  .login-form {
+    display: block;
+    position: relative;
+    width: 520px;
+    max-width: 100%;
+    padding: 0px 15px;
+    margin: 0 auto;
+    overflow: hidden;
+  }
+
+  .tips {
+    font-size: 14px;
+    color: #fff;
+    margin-bottom: 10px;
+
+    span {
+      &:first-of-type {
+        margin-right: 16px;
+      }
+    }
+  }
+
+  .svg-container {
+    padding: 0px 0px 6px 5px;
+    margin-bottom: -10px;
+    color: $dark_gray;
+    vertical-align: middle;
+    width: 30px;
+    display: inline-block;
+    .svgImg {
+      width: 1em;
+      height: 1em;
+      vertical-align: -0.16em;
+      fill: currentColor;
+      overflow: hidden;
+    }
+  }
+
+  .title-container {
+    .title {
+      color: #7e7e7e;
+      text-align: center;
+      letter-spacing: -0.05em;
+      line-height: 20px;
+      font-weight: 500;
+      font-family: "Helvetica Neue", Helvetica, "PingFang SC",
+        "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+      margin-bottom: 10px;
+    }
+    h1.title:before,
+    h1.title:after {
+      content: "";
+      height: 1px;
+      position: absolute;
+      top: 37px;
+      width: 35%;
+    }
+    h1.title:before {
+      background: rgb(126, 126, 126);
+      background: -moz-linear-gradient(
+        to left,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      background: -webkit-linear-gradient(
+        to left,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      background: -moz-linear-gradient(
+        to left,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      background: -ms-linear-gradient(
+        to left,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      background: linear-gradient(
+        to left,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      left: 0px;
+    }
+    h1.title:after {
+      background: rgb(126, 126, 126);
+      background: -moz-linear-gradient(
+        to right,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      background: -webkit-linear-gradient(
+        to right,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      background: -moz-linear-gradient(
+        to right,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      background: -ms-linear-gradient(
+        to right,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      background: linear-gradient(
+        to right,
+        rgba(126, 126, 126, 1) 0%,
+        rgba(255, 255, 255, 1) 100%
+      );
+      right: 0px;
+    }
+  }
+
+  .show-pwd {
+    position: absolute;
+    right: 10px;
+    top: 3px;
+    font-size: 16px;
+    color: $dark_gray;
+    cursor: pointer;
+    user-select: none;
+  }
+
+  .thirdparty-button {
+    position: absolute;
+    right: 0;
+    bottom: 6px;
+  }
+
+  @media only screen and (max-width: 470px) {
+    .thirdparty-button {
+      display: none;
+    }
+  }
+
+  .login-wrap {
+    position: absolute;
+    top: 70%;
+    left: 0;
+    right: 0;
+    width: 100%;
+    height: 418px;
+    text-align: center;
+    transform: translate(0, -50%);
   }
 }
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-.login-code {
-  width: 33%;
-  height: 38px;
-  float: right;
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
-}
-.el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
-.login-code-img {
-  height: 38px;
-}
 </style>
diff --git a/src/views/management/codeprogram.vue b/src/views/management/codeprogram.vue
new file mode 100644
index 0000000..59cee86
--- /dev/null
+++ b/src/views/management/codeprogram.vue
@@ -0,0 +1,662 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="代码名称" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入代码名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="项目名称" prop="subjectName">
+        <el-input
+          v-model="queryParams.subjectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="" prop="subjectType">
+        <el-select
+          v-model="queryParams.subjectType"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in dict.type.mes_dvsubject_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['mes:dv:dvsubject:add']"
+            >新增</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        'text-align': 'center',
+      }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="代码程序名称"
+        align="center"
+        prop="codeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="代码程序编号"
+        align="center"
+        prop="code"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="版本号"
+        align="center"
+        prop="version"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="所属设备类型"
+        align="center"
+        prop="machineryTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="关联设备"
+        align="center"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <span
+            v-for="(val, index) in scope.row.cadCodeMachineryList"
+            :key="index"
+          >
+            <span class="apostrophe">{{ val.machineryName }}，</span>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >导出</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="代码名称" prop="codeName">
+          <el-input v-model="form.codeName" placeholder="请输入代码名称" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="代码编号" prop="code">
+              <el-input v-model="form.code" placeholder="请输入代码编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="版本号" prop="version">
+              <el-input v-model="form.version" placeholder="请输入版本号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="所属设备类别"
+              label-width="120px"
+              prop="machineryTypeId"
+            >
+              <treeselect
+                v-model="form.machineryTypeId"
+                :options="machineryTypeOptions"
+                :normalizer="normalizer"
+                placeholder="请选择所属分类"
+                @select="handleNodeClick"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="代码上传" prop="" label-width="100px">
+              <el-upload
+                ref="codeName"
+                class="upload-demo"
+                :headers="this.headers"
+                action="/prod-api/common/uploadMinio"
+                :before-remove="beforeRemove"
+                :on-change="customUploadChangeImage2"
+                :before-upload="beforeUpload"
+                :on-exceed="handleExceedImage1"
+                accept=".PDF"
+                name="file"
+                multiple
+                :limit="1"
+                :file-list="fileList"
+              >
+                <el-button size="small" type="primary" icon="el-icon-upload2"
+                  >点击上传</el-button
+                >
+                <el-button type="primary" size="small" @click.stop="previewFile"
+                  >&nbsp;预览文件</el-button
+                >
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="关联设备" prop="machineryIdsArr">
+          <el-select
+            v-model="machineryIdsArr"
+            placeholder="请选择关联设备"
+            clearable
+            filterable
+            multiple
+            style="width: 100%"
+            value-key="machineryId"
+            @change="handleAccompanyId"
+          >
+            <el-option
+              v-for="dict in listTypeArr"
+              :key="dict.machineryId"
+              :label="dict.machineryName"
+              :value="dict"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  list,
+  updateTeam,
+  reviseFile,
+  delTeam,
+  listMachinery,
+} from "@/api/management/codeprogram";
+import { genCode } from "@/api/system/autocode/rule";
+import { getToken } from "@/utils/auth";
+import { listMachinerytype } from "@/api/mes/dv/machinerytype";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_dvsubject_type"],
+  components: { Treeselect },
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+        enableFlag: null,
+        machineryTypeId: null,
+      },
+      machineryIdsArr: null,
+      // 表单参数
+      form: {
+        subjectId: null,
+        machineryTypeId: null,
+        url: "",
+        originalName: "",
+        machineryIds: "",
+        machineryTypeName: "",
+      },
+      fileList: [],
+      listTypeArr: {},
+      // 设备类型树选项
+      machineryTypeOptions: [],
+      machineryName: [],
+      // 表单校验
+      rules: {
+        codeName: [
+          { required: true, message: "代码名称不能为空", trigger: "blur" },
+        ],
+        code: [
+          { required: true, message: "代码编码不能为空", trigger: "blur" },
+        ],
+        version: [
+          { required: true, message: "版本号不能为空", trigger: "blur" },
+        ],
+        machineryTypeId: [
+          { required: true, message: "所属设备类别不能为空", trigger: "blur" },
+        ],
+        machineryIds: [
+          { required: true, message: "关联设备不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.data;
+        this.total = response.data.length;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        subjectId: null,
+        machineryTypeId: null,
+        url: "",
+        originalName: "",
+        machineryIds: "",
+        machineryTypeName: "",
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.codeId);
+      this.queryParams.ids = this.ids.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.fileList = [];
+      this.machineryIdsArr = {};
+      this.listTypeArr = {};
+      this.open = true;
+      this.title = "新增代码";
+    },
+
+    /** 查询设备类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then((response) => {
+        this.machineryTypeOptions = [];
+        const data = this.handleTree(
+          response.data,
+          "machineryTypeId",
+          "parentTypeId"
+        )[0];
+        this.machineryTypeOptions.push(data);
+      });
+    },
+
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.machineryTypeId,
+        label: node.machineryTypeName,
+        children: node.children,
+      };
+    },
+
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.machineryIdsArr = [];
+      this.form.machineryTypeName = data.machineryTypeName;
+      let arr = {
+        pageNum: 1,
+        pageSize: 9999,
+        machineryTypeId: null,
+      };
+      arr.machineryTypeId = data.machineryTypeId;
+
+      listMachinery(arr).then((response) => {
+        this.listTypeArr = response.rows;
+      });
+    },
+
+    //选择关联的设备
+    handleAccompanyId(val) {
+      var arrid = [];
+      for (var item of val) {
+        arrid.push(item.machineryId);
+        this.form.machineryIds = arrid.join(",");
+      }
+    },
+
+    beforeUpload(e) {
+      // console.log(e);
+      this.files = e;
+    },
+    customUploadChangeImage2(files) {
+      if (files.status === "ready") return;
+      if (files.status === "success") {
+        const res = files.response || {};
+        if (res && res.code === 200) {
+          this.form.url = files.response.url;
+          this.form.originalName = files.response.originalFileName;
+          this.$message({
+            type: "success",
+            message: "上传成功!",
+          });
+          this.uploadVisible = false;
+        } else {
+          this.$message.error("上传失败!");
+          this.fileList = [];
+        }
+      } else {
+        this.$message.error("上传失败!");
+        this.fileList = [];
+      }
+    },
+
+    // 删除文件
+    beforeRemove(files, fileList) {
+      return this.$confirm(`确定移除 ${files.name}？`);
+    },
+
+    // 上传按钮 限制图文件大小和类型
+    handleChangeUpload(file, fileList) {
+      const isLt2M = file.size / 1024 / 1024 < 10;
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 10MB!");
+        return false;
+      }
+    },
+    handleExceedImage1(file, fileList) {
+      // console.log(file);
+      this.$message.warning(`当前限制上传 1 个文件，以上传 ${file.length} 个`);
+    },
+
+    //预览文件
+    previewFile() {
+      if (this.form.url != undefined && this.form.url != "") {
+        var url = this.form.url;
+        window.open(url);
+      } else {
+        this.$message.warning(`请上传文件`);
+      }
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.fileList = [];
+      this.machineryIdsArr = {};
+      this.form = row;
+      var name = {};
+      if (row.originalName != undefined && row.originalName != "") {
+        this.$set(name, "name", row.originalName);
+        this.fileList.push(name);
+      }
+      let arr = {
+        pageNum: 1,
+        pageSize: 9999,
+        machineryTypeId: null,
+      };
+      arr.machineryTypeId = row.machineryTypeId;
+      listMachinery(arr).then((response) => {
+        this.listTypeArr = response.rows;
+      });
+      let arr1 = row.cadCodeMachineryList.map((item) => item.machineryName);
+      this.machineryIdsArr = arr1;
+      let arr2 = row.cadCodeMachineryList.map((item) => item.machineryId);
+      this.form.machineryIds = arr2.join(",");
+      this.form.subjectId = row.codeId || this.ids;
+      this.open = true;
+      this.title = "修改代码";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.subjectId != null) {
+            reviseFile(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "修改成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.listTypeArr = {};
+                this.machineryIdsArr = {};
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            updateTeam(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "新增成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.listTypeArr = {};
+                this.machineryIdsArr = {};
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const subjectIds = row.codeId || this.ids;
+      this.$modal
+        .confirm("是否确认删除当前的数据项？")
+        .then(function () {
+          return delTeam(subjectIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+
+    /** 单选导出按钮操作 */
+    handleExportArr(e) {
+      this.queryParams.ids = e.codeId;
+      this.download(
+        "/cad/code/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+::v-deep .el-table {
+  .cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+</style>
diff --git a/src/views/management/document.vue b/src/views/management/document.vue
new file mode 100644
index 0000000..901e769
--- /dev/null
+++ b/src/views/management/document.vue
@@ -0,0 +1,722 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="文档名称" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          placeholder="请输入文档名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="项目名称" prop="subjectName">
+        <el-input
+          v-model="queryParams.subjectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in listTypeArr"
+            :key="dict.id"
+            :label="dict.name"
+            :value="dict.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['mes:dv:dvsubject:add']"
+            >新增</el-button
+          >
+        </el-col>
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+        </el-col> -->
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col>
+      </el-col>
+      <!-- <el-col :span="1">
+        <el-button type="primary" size="mini" @click="Notificationsettings"
+          >文档类型管理</el-button
+        >
+      </el-col> -->
+
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="文档名称" align="center" prop="fileName" />
+      <el-table-column label="文档编号" align="center" prop="fileCode" />
+      <el-table-column
+        label="版本号"
+        align="center"
+        prop="version"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="文档类型"
+        align="center"
+        prop="typeName"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enableFlag"
+          />
+        </template>
+      </el-table-column> -->
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="handleExportArr(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >导出</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改设备点检保养项目对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="文档名称" prop="fileName">
+          <el-input v-model="form.fileName" placeholder="请输入文档名称" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="文档编号" prop="fileCode">
+              <el-input v-model="form.fileCode" placeholder="请输入文档编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="版本号" prop="version">
+              <el-input v-model="form.version" placeholder="请输入版本号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="文档类别" prop="typeName">
+              <el-select
+                v-model="form.typeName"
+                placeholder="请选择文档类别"
+                clearable
+                style="width: 100%"
+                @change="typeNameArr($event)"
+                value-key="id"
+              >
+                <el-option
+                  v-for="dict in listTypeArr"
+                  :key="dict.id"
+                  :label="dict.name"
+                  :value="dict"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="文件上传:"
+              prop="originalName"
+              label-width="100px"
+            >
+              <el-upload
+                ref="originalName"
+                class="upload-demo"
+                :headers="this.headers"
+                action="/prod-api/common/uploadMinio"
+                :before-remove="beforeRemove"
+                :on-change="customUploadChangeImage2"
+                :before-upload="beforeUpload"
+                :on-exceed="handleExceedImage1"
+                accept=".PDF"
+                name="file"
+                multiple
+                :limit="1"
+                :file-list="fileList"
+              >
+                <el-button size="small" type="primary" icon="el-icon-upload2"
+                  >点击上传</el-button
+                >
+                <el-button type="primary" size="small" @click.stop="previewFile"
+                  >&nbsp;预览文件</el-button
+                >
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.remark"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 文档类型管理 -->
+    <!-- <el-dialog
+      title="文档类型管理"
+      :visible.sync="NotificationsettingsV"
+      center
+    >
+      <el-form ref="documentType" :model="documentType">
+        <span>
+          <el-form-item label-width="130px" label="新增文档类型名称">
+            <el-input
+              size="small"
+              v-model="addPriceForm.unit"
+              style="width: 30%"
+            />&nbsp;&nbsp;
+            <el-button type="primary" size="small" @click="showAddPrice"
+              >添加</el-button
+            >
+          </el-form-item>
+        </span>
+        <el-card shadow="never">
+          <div slot="header">
+            <span>现有文件类型</span>
+          </div>
+          <el-row>
+            <el-col
+              :span="6"
+              v-for="(item, index) in documentType"
+              :key="index"
+            >
+              <el-form-item label-width="30px">
+                <el-input
+                  v-model="item.unit"
+                  size="small"
+                  :disabled="true"
+                  :max="99999.99"
+                  style="width: 60%"
+                />
+                <el-button
+                  type="danger"
+                  plain
+                  size="small"
+                  icon="el-icon-close"
+                  @click.prevent="removeDomain(item)"
+                ></el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="NotificationsettingsV = false">取消</el-button>
+        <el-button type="primary" @click="validatoProInput">确认</el-button>
+      </div>
+    </el-dialog> -->
+  </div>
+</template>
+
+<script>
+import {
+  list,
+  updateTeam,
+  reviseFile,
+  delTeam,
+  listType,
+} from "@/api/management/document";
+import { genCode } from "@/api/system/autocode/rule";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_dvsubject_type"],
+  data() {
+    return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      id: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fileName: null,
+        type: null,
+        ids: null,
+      },
+      // 表单参数
+      form: { typeName: "", type: "", url: "", originalName: "" },
+      // 文档类型管理弹框
+      // NotificationsettingsV: false,
+      // 弹框数据
+      documentType: [
+        {
+          unit: "第一方",
+        },
+        {
+          unit: "第二方",
+        },
+        {
+          unit: "第三方",
+        },
+        {
+          unit: "第四方",
+        },
+        {
+          unit: "第五方",
+        },
+      ],
+      addPriceForm: {
+        unit: "",
+      },
+      // 文件类型列表
+      listTypeArr: {},
+      fileList: [],
+      // 表单校验
+      rules: {
+        fileName: [
+          { required: true, message: "文档名称不能为空", trigger: "blur" },
+        ],
+        fileCode: [
+          { required: true, message: "文档编号不能为空", trigger: "blur" },
+        ],
+        type: [{ required: true, message: "请选择项目类型", trigger: "blur" }],
+        originalName: [
+          { required: true, message: "文件上传不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      listType().then((response) => {
+        this.listTypeArr = response.rows;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        subjectId: null,
+        fileName: null,
+        fileCode: null,
+        type: null,
+        remark: null,
+        createTime: null,
+        updateTime: null,
+        url: null,
+        originalName: null,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.id = selection.map((item) => item.id);
+      this.queryParams.ids = this.id.join(",");
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.fileList = [];
+      listType().then((response) => {
+        this.listTypeArr = response.rows;
+      });
+      this.open = true;
+      this.title = "新增文档";
+    },
+
+    typeNameArr(e) {
+      this.form.typeName = e.name;
+      this.form.type = e.id;
+    },
+
+    beforeUpload(e) {
+      // console.log(e);
+      this.files = e;
+    },
+    customUploadChangeImage2(files) {
+      if (files.status === "ready") return;
+      if (files.status === "success") {
+        const res = files.response || {};
+        if (res && res.code === 200) {
+          this.form.url = files.response.url;
+          this.form.originalName = files.response.originalFileName;
+          this.$message({
+            type: "success",
+            message: "上传成功!",
+          });
+          this.uploadVisible = false;
+        } else {
+          this.$message.error("上传失败!");
+          this.fileList = [];
+        }
+      } else {
+        this.$message.error("上传失败!");
+        this.fileList = [];
+      }
+    },
+
+    // 删除文件
+    beforeRemove(files, fileList) {
+      return this.$confirm(`确定移除 ${files.name}？`);
+    },
+
+    // 上传按钮 限制图文件大小和类型
+    handleChangeUpload(file, fileList) {
+      const isLt2M = file.size / 1024 / 1024 < 10;
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 10MB!");
+        return false;
+      }
+    },
+    handleExceedImage1(file, fileList) {
+      // console.log(file);
+      this.$message.warning(`当前限制上传 1 个文件，以上传 ${file.length} 个`);
+    },
+
+    //预览文件
+    previewFile() {
+      if (this.form.url != undefined && this.form.url != "") {
+        var url = this.form.url;
+        window.open(url);
+      } else {
+        this.$message.warning(`请上传文件`);
+      }
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.fileList = [];
+      this.form = row;
+      var name = {};
+      this.$set(name, "name", row.originalName);
+      this.fileList.push(name);
+      this.form.subjectId = row.id || this.id;
+      this.open = true;
+      this.title = "修改文档";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.subjectId != null) {
+            reviseFile(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "修改成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            updateTeam(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "新增成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const subjectIds = row.id || this.id;
+      this.$modal
+        .confirm("是否确认删除当前的数据项？")
+        .then(function () {
+          return delTeam(subjectIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/cad/file/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+
+    /** 单选导出按钮操作 */
+    handleExportArr(e) {
+      this.queryParams.ids = e.id;
+      this.download(
+        "/cad/file/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+
+    // // 文档类型管理弹框
+    // Notificationsettings() {
+    //   this.addPriceForm = {
+    //     unit: "",
+    //     type: 1,
+    //   };
+    //   this.NotificationsettingsV = true;
+    //   // reagentsGlance.unitDropDown().then(res => {
+    //   //   console.log(res);
+    //   //   if (res.code === 200) {
+    //   //     this.documentType.measureList = res.result.measureList || [];
+    //   //     this.documentType.smallList = res.result.smallList || [];
+    //   //     this.documentType.bigList = res.result.bigList || [];
+    //   //   }
+    //   // });
+    // },
+    //新增文档类型
+    // showAddPrice() {
+    //   // if (this.addPriceForm.unit != "") {
+    //   //   this.orderForm.bigList.push({
+    //   //     unit: this.addPriceForm.unit,
+    //   //     type: 1,
+    //   //   });
+    //   //   reagentsGlance
+    //   //     .addReagentUnit({ unit: this.addPriceForm.unit, type: 1 })
+    //   //     .then((res) => {
+    //   //       console.log(22);
+    //   //       if (res.code === 200) {
+    //   //         console.log(res);
+    //   //         this.$notify({
+    //   //           title: "成功",
+    //   //           message: res.message,
+    //   //           type: "success",
+    //   //         });
+    //   //         this.orderDialogVisible = false;
+    //   //       } else {
+    //   //         this.$notify({
+    //   //           title: "失败",
+    //   //           message: res.message,
+    //   //           type: "error",
+    //   //         });
+    //   //       }
+    //   //     });
+    //   // } else {
+    //   //   this.$message.warning("请录入文档类型");
+    //   // }
+    // },
+    //删除文档类型
+    // removeDomain(item) {
+    //   // this.$confirm('是否确认删除名称为"' + item.unit + '"的单位?', "警告", {
+    //   //   confirmButtonText: "确定",
+    //   //   cancelButtonText: "取消",
+    //   //   type: "warning",
+    //   // }).then(() => {
+    //   //   reagentsGlance
+    //   //     .removeUnit({
+    //   //       id: item.id,
+    //   //     })
+    //   //     .then((result) => {
+    //   //       if (result.code === 200) {
+    //   //         var index = this.orderForm.smallList.indexOf(item);
+    //   //         if (index !== -1) {
+    //   //           this.orderForm.smallList.splice(index, 1);
+    //   //         }
+    //   //         this.$notify({
+    //   //           title: "成功",
+    //   //           message: result.message,
+    //   //           type: "success",
+    //   //         });
+    //   //       } else {
+    //   //         this.$notify({
+    //   //           title: "失败",
+    //   //           message: result.message,
+    //   //           type: "error",
+    //   //         });
+    //   //       }
+    //   //     });
+    //   // });
+    // },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+</style>
diff --git a/src/views/management/documentType.vue b/src/views/management/documentType.vue
new file mode 100644
index 0000000..7d0695d
--- /dev/null
+++ b/src/views/management/documentType.vue
@@ -0,0 +1,428 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="类型名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入类型名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="项目名称" prop="subjectName">
+        <el-input
+          v-model="queryParams.subjectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="是否启用" prop="active">
+        <el-select
+          v-model="queryParams.active"
+          placeholder="请选择是否启用"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in whetherEnabled"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['mes:dv:dvsubject:add']"
+            >新增</el-button
+          >
+        </el-col>
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+        </el-col> -->
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </el-col>
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col> -->
+      </el-col>
+
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="文档类型名称" align="center" prop="name" />
+      <el-table-column label="是否启用" align="center" prop="active">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.active == '0'"
+            >是</span
+          >
+          <span class="el-table-column-span-1" v-if="scope.row.active == '2'"
+            >否</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label-width="120px" label="文档类型名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入文档类型名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="active">
+              <!-- <el-radio-group v-model="form.enableFlag">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                  >{{ dict.label }}</el-radio
+                >
+              </el-radio-group> -->
+
+              <el-radio-group v-model="form.active">
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="2">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.remark"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  list,
+  updateTeam,
+  reviseFile,
+  delTeam,
+} from "@/api/management/documentType";
+import { genCode } from "@/api/system/autocode/rule";
+export default {
+  name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_dvsubject_type"],
+  data() {
+    return {
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      id: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        active: null,
+      },
+      // 表单参数
+      form: {
+        subjectId: null,
+        active: 0,
+      },
+      whetherEnabled: [
+        {
+          value: "0",
+          label: "是",
+        },
+        {
+          value: "2",
+          label: "否",
+        },
+      ],
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "文档类型名称不能为空", trigger: "blur" },
+        ],
+        active: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      list(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        subjectId: null,
+        name: null,
+        active: 0,
+        remark: null,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.id = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增代码";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form = row;
+      this.form.subjectId = row.id;
+      this.open = true;
+      this.title = "修改代码";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.subjectId != null) {
+            reviseFile(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "修改成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            updateTeam(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "新增成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const subjectIds = row.id || this.id;
+      this.$modal
+        .confirm("是否确认删除当前的数据项？")
+        .then(function () {
+          return delTeam(subjectIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      //   this.download(
+      //     "dv/dvsubject/export",
+      //     {
+      //       ...this.queryParams,
+      //     },
+      //     `dvsubject_${new Date().getTime()}.xlsx`
+      //   );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+
+.el-table-column-span {
+  background-color: #e8f4ff;
+  border-color: #d1e9ff;
+  color: #1890ff;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+.el-table-column-span-1 {
+  background-color: #ffeded;
+  border-color: #ffdbdb;
+  color: #ff4949;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue
index 2fc18f3..5639e3b 100644
--- a/src/views/mes/cal/plan/index.vue
+++ b/src/views/mes/cal/plan/index.vue
@@ -1,8 +1,18 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="班组类型" prop="calendarType">
-        <el-select v-model="queryParams.calendarType" placeholder="请选择班组类型">
+        <el-select
+          v-model="queryParams.calendarType"
+          placeholder="请选择班组类型"
+        >
           <el-option
             v-for="dict in dict.type.mes_calendar_type"
             :key="dict.value"
@@ -28,24 +38,36 @@
         />
       </el-form-item>
       <el-form-item label="开始日期" prop="startDate">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.startDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择开始日期">
+          placeholder="请选择开始日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结束日期" prop="endDate">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.endDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择结束日期">
+          placeholder="请选择结束日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -58,7 +80,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:cal:calplan:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -69,7 +92,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:cal:calplan:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -79,77 +103,120 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:cal:calplan:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="calplanList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />      
-      <el-table-column label="计划编号" align="center" prop="planCode" >
-          <template slot-scope="scope">
-                <el-button              
-                  type="text"
-                  @click="handleView(scope.row)"
-                  v-hasPermi="['mes:cal:calplan:query']"
-                >{{scope.row.planCode}}</el-button>
-          </template>
+    <el-table
+      v-loading="loading"
+      :data="calplanList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="计划编号" align="center" prop="planCode">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:cal:plan:query']"
+            >{{ scope.row.planCode }}</el-button
+          >
+        </template>
       </el-table-column>
-      <el-table-column label="计划名称" width="200px" align="center" prop="planName" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="计划名称"
+        width="200px"
+        align="center"
+        prop="planName"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="班组类型" align="center" prop="calendarType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_calendar_type" :value="scope.row.calendarType"/>
+          <dict-tag
+            :options="dict.type.mes_calendar_type"
+            :value="scope.row.calendarType"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="开始日期" align="center" prop="startDate" width="120">
+      <el-table-column
+        label="开始日期"
+        align="center"
+        prop="startDate"
+        width="120"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.startDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束日期" align="center" prop="endDate" width="120">
+      <el-table-column
+        label="结束日期"
+        align="center"
+        prop="endDate"
+        width="120"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.endDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="轮班方式" align="center" prop="shiftType" >
+      <el-table-column label="轮班方式" align="center" prop="shiftType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_shift_type" :value="scope.row.shiftType"/>
+          <dict-tag
+            :options="dict.type.mes_shift_type"
+            :value="scope.row.shiftType"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="倒班方式" align="center" prop="shiftMethod" >
+      <el-table-column label="倒班方式" align="center" prop="shiftMethod">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_shift_method" :value="scope.row.shiftMethod"/>
+          <dict-tag
+            :options="dict.type.mes_shift_method"
+            :value="scope.row.shiftMethod"
+          />
         </template>
       </el-table-column>
       <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.mes_order_status"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:cal:calplan:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="scope.row.status == 'PREPARE'"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:cal:calplan:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -157,7 +224,13 @@
     />
 
     <!-- 添加或修改排班计划对话框 -->
-    <el-dialog :title="title" v-loading="formLoading" :visible.sync="open" width="960px" append-to-body>
+    <el-dialog
+      :title="title"
+      v-loading="formLoading"
+      :visible.sync="open"
+      width="960px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
@@ -166,11 +239,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >               
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
@@ -183,27 +259,34 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="开始日期" prop="startDate">
-              <el-date-picker clearable
+              <el-date-picker
+                clearable
                 v-model="form.startDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择开始日期">
+                placeholder="请选择开始日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="结束日期" prop="endDate">
-              <el-date-picker clearable
+              <el-date-picker
+                clearable
                 v-model="form.endDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择结束日期">
+                placeholder="请选择结束日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="班组类型" prop="calendarType">
-              <el-select v-model="form.calendarType" placeholder="请选择班组类型">
+              <el-select
+                v-model="form.calendarType"
+                placeholder="请选择班组类型"
+              >
                 <el-option
                   v-for="dict in dict.type.mes_calendar_type"
                   :key="dict.value"
@@ -222,13 +305,18 @@
                   v-for="dict in dict.type.mes_shift_type"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.shiftType !='SINGLE'" :span="6">
+          <el-col v-if="form.shiftType != 'SINGLE'" :span="6">
             <el-form-item label="倒班方式" prop="shiftMethod">
-              <el-select style="width:100px" v-model="form.shiftMethod" placeholder="请选择倒班方式">
+              <el-select
+                style="width: 100px"
+                v-model="form.shiftMethod"
+                placeholder="请选择倒班方式"
+              >
                 <el-option
                   v-for="dict in dict.type.mes_shift_method"
                   :key="dict.value"
@@ -238,9 +326,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.shiftMethod =='DAY' && form.shiftType !='SINGLE'" :span="6">
+          <el-col
+            v-if="form.shiftMethod == 'DAY' && form.shiftType != 'SINGLE'"
+            :span="6"
+          >
             <el-form-item label-width="20" prop="shiftCount">
-              <el-input-number :min="1"  controls-position="right" v-model="form.shiftCount" >
+              <el-input-number
+                :min="1"
+                controls-position="right"
+                v-model="form.shiftCount"
+              >
               </el-input-number>
             </el-form-item>
           </el-col>
@@ -248,23 +343,53 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <el-tabs type="border-card" v-if="form.planId != null">
         <el-tab-pane label="班次">
-          <Shift ref="shiftTab" :planId="form.planId" :optType="optType"></Shift>
+          <Shift
+            ref="shiftTab"
+            :planId="form.planId"
+            :optType="optType"
+          ></Shift>
         </el-tab-pane>
         <el-tab-pane label="班组">
-          <Team  ref="teamTab" :planId="form.planId" :calendarType="form.calendarType" :optType="optType"></Team>
+          <Team
+            ref="teamTab"
+            :planId="form.planId"
+            :calendarType="form.calendarType"
+            :optType="optType"
+          ></Team>
         </el-tab-pane>
       </el-tabs>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE'">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
-        <el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view'  && form.planId !=null">完成</el-button>
+        <el-button
+          type="primary"
+          @click="cancel"
+          v-if="optType == 'view' || form.status != 'PREPARE'"
+          >返回</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
+          >确 定</el-button
+        >
+        <el-button
+          type="success"
+          @click="handleFinish"
+          v-if="
+            form.status == 'PREPARE' && optType != 'view' && form.planId != null
+          "
+          >完成</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -272,18 +397,29 @@
 </template>
 
 <script>
-import { listCalplan, getCalplan, delCalplan, addCalplan, updateCalplan } from "@/api/mes/cal/calplan";
+import {
+  listCalplan,
+  getCalplan,
+  delCalplan,
+  addCalplan,
+  updateCalplan,
+} from "@/api/mes/cal/calplan";
 import Shift from "./shift";
-import Team  from "./team";
-import {genCode} from "@/api/system/autocode/rule"
+import Team from "./team";
+import { genCode } from "@/api/system/autocode/rule";
 export default {
   name: "Calplan",
-  dicts: ['mes_shift_method','mes_shift_type','mes_calendar_type','mes_order_status'],
-  components: {Shift,Team},
+  dicts: [
+    "mes_shift_method",
+    "mes_shift_type",
+    "mes_calendar_type",
+    "mes_order_status",
+  ],
+  components: { Shift, Team },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: false,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -310,7 +446,7 @@ export default {
         pageSize: 10,
         planCode: null,
         planName: null,
-        calendarType:null,
+        calendarType: null,
         startDate: null,
         endDate: null,
         shiftType: null,
@@ -321,21 +457,21 @@ export default {
       // 表单校验
       rules: {
         planCode: [
-          { required: true, message: "计划编号不能为空", trigger: "blur" }
+          { required: true, message: "计划编号不能为空", trigger: "blur" },
         ],
         planName: [
-          { required: true, message: "计划名称不能为空", trigger: "blur" }
+          { required: true, message: "计划名称不能为空", trigger: "blur" },
         ],
-        calendarType:[
-          { required: true, message: "请选择班组类型", trigger: "blur" }
+        calendarType: [
+          { required: true, message: "请选择班组类型", trigger: "blur" },
         ],
         startDate: [
-          { required: true, message: "开始日期不能为空", trigger: "blur" }
+          { required: true, message: "开始日期不能为空", trigger: "blur" },
         ],
         endDate: [
-          { required: true, message: "结束日期不能为空", trigger: "blur" }
+          { required: true, message: "结束日期不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -345,7 +481,7 @@ export default {
     /** 查询排班计划列表 */
     getList() {
       this.loading = true;
-      listCalplan(this.queryParams).then(response => {
+      listCalplan(this.queryParams).then((response) => {
         this.calplanList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -362,11 +498,11 @@ export default {
         planId: null,
         planCode: null,
         planName: null,
-        calendarType:null,
+        calendarType: null,
         startDate: null,
         endDate: null,
-        shiftType: 'SHIFT_TWO',
-        shiftMethod: 'MONTH',
+        shiftType: "SHIFT_TWO",
+        shiftMethod: "MONTH",
         shiftCount: 1,
         status: "PREPARE",
         remark: null,
@@ -377,7 +513,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -393,9 +529,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.planId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.planId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -405,10 +541,10 @@ export default {
       this.optType = "add";
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
-      const planId = row.planId || this.ids
-      getCalplan(planId).then(response => {
+      const planId = row.planId || this.ids;
+      getCalplan(planId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "查看排班计划";
@@ -418,8 +554,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const planId = row.planId || this.ids
-      getCalplan(planId).then(response => {
+      const planId = row.planId || this.ids;
+      getCalplan(planId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改排班计划";
@@ -427,17 +563,24 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm() {      
-      this.$refs["form"].validate(valid => {
+    submitForm() {
+      this.formLoading = true;
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.planId != null) {
-            updateCalplan(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+            updateCalplan(this.form).then(
+              (response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+                this.formLoading = false;
+              },
+              (err) => {
+                this.formLoading = false;
+              }
+            );
           } else {
-            addCalplan(this.form).then(response => {
+            addCalplan(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -449,50 +592,63 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const planIds = row.planId || this.ids;
-      this.$modal.confirm('是否确认删除排班计划编号为"' + planIds + '"的数据项？').then(function() {
-        return delCalplan(planIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除排班计划编号为"' + planIds + '"的数据项？')
+        .then(function () {
+          return delCalplan(planIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
-    handleFinish(){
+    handleFinish() {
       let that = this;
-      this.$modal.confirm('是否完成计划编制？【完成后将不能更改】').then(function(){
-        that.form.status = 'CONFIRMED';
-        that.$refs["form"].validate(valid => {
-        if (valid) {
-          if (that.form.planId != null) {
-            updateCalplan(that.form).then(response => {
-              that.$modal.msgSuccess("已完成");
-              that.open = false;
-              that.getList();
-              that.formLoading = false;
-            },err =>{
-              that.form.status = 'PREPARE';
-              that.formLoading = false;
-            });
-          }
-        }
-      });
-      });
+      this.$modal
+        .confirm("是否完成计划编制？【完成后将不能更改】")
+        .then(function () {
+          that.form.status = "CONFIRMED";
+          that.$refs["form"].validate((valid) => {
+            if (valid) {
+              if (that.form.planId != null) {
+                updateCalplan(that.form).then(
+                  (response) => {
+                    that.$modal.msgSuccess("已完成");
+                    that.open = false;
+                    that.getList();
+                    that.formLoading = false;
+                  },
+                  (err) => {
+                    that.form.status = "PREPARE";
+                    that.formLoading = false;
+                  }
+                );
+              }
+            }
+          });
+        });
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('cal/calplan/export', {
-        ...this.queryParams
-      }, `calplan_${new Date().getTime()}.xlsx`)
+      this.download(
+        "/cad/file/export",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('CAL_PLAN_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("CAL_PLAN_CODE").then((response) => {
           this.form.planCode = response;
         });
-      }else{
+      } else {
         this.form.planCode = null;
       }
     },
-  }
+  },
 };
 </script>
diff --git a/src/views/mes/cal/team/index.vue b/src/views/mes/cal/team/index.vue
index 53de664..3ac67cf 100644
--- a/src/views/mes/cal/team/index.vue
+++ b/src/views/mes/cal/team/index.vue
@@ -191,7 +191,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -294,6 +294,9 @@ export default {
       this.open = true;
       this.title = "添加班组";
       this.optType = "add";
+      genCode('CAL_TEAM_CODE').then(response =>{
+        this.form.teamCode = response;
+      });
     },
         // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/dv/checkplan/index.vue b/src/views/mes/dv/checkplan/index.vue
index a0fb0d3..9313cb0 100644
--- a/src/views/mes/dv/checkplan/index.vue
+++ b/src/views/mes/dv/checkplan/index.vue
@@ -386,7 +386,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
diff --git a/src/views/mes/dv/largeScreen/components/AGVrate.vue b/src/views/mes/dv/largeScreen/components/AGVrate.vue
new file mode 100644
index 0000000..d49ff3f
--- /dev/null
+++ b/src/views/mes/dv/largeScreen/components/AGVrate.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="AGVrate" style="width: 100%; height: 150px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("AGVrate"));
+
+      let value = "0%";
+      let title = "设备在线率";
+      var option = {
+        title: [
+          {
+            text: "{a|" + value + "}\n{c|" + title + "}",
+            x: "center",
+            top: "35%",
+            textStyle: {
+              rich: {
+                a: {
+                  fontSize: 15,
+                  color: "#ffffff",
+                },
+                c: {
+                  fontSize: 10,
+                  color: "#ffffff",
+                  padding: [5, 0],
+                },
+              },
+            },
+          },
+        ],
+        // backgroundColor: "#111",
+        polar: {
+          radius: ["70%", "95%"],
+          center: ["50%", "50%"],
+        },
+        angleAxis: {
+          max: 100,
+          show: false,
+        },
+        radiusAxis: {
+          type: "category",
+          show: true,
+          axisLabel: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            name: "",
+            type: "bar",
+            roundCap: true,
+            barWidth: 90,
+            showBackground: true,
+            backgroundStyle: {
+              color: "rgba(66, 66, 66, .3)",
+            },
+            // data: [10],
+            coordinateSystem: "polar",
+
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                  {
+                    offset: 0,
+                    color: "#717171",
+                  },
+                  {
+                    offset: 1,
+                    color: "#717171",
+                  },
+                ]),
+              },
+            },
+          },
+          // {
+          //     name: '',
+          //     type: 'pie',
+          //     startAngle: 80,
+          //     radius: ['6%'],
+          //     hoverAnimation: false,
+          //     center: ['50%', '50%'],
+          //     itemStyle: {
+          //         color: 'rgba(66, 66, 66, .1)',
+          //         borderWidth: 1,
+          //         borderColor: '#5269EE',
+          //     },
+          //     data: [100],
+          // },
+          {
+            name: "",
+            type: "pie",
+            startAngle: 80,
+            radius: ["100%"],
+            hoverAnimation: false,
+            center: ["50%", "50%"],
+            itemStyle: {
+              color: "rgba(66, 66, 66, .1)",
+              borderWidth: 1,
+              borderColor: "#5269EE",
+            },
+            data: [100],
+          },
+        ],
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/dv/largeScreen/components/fault.vue b/src/views/mes/dv/largeScreen/components/fault.vue
new file mode 100644
index 0000000..4f5c308
--- /dev/null
+++ b/src/views/mes/dv/largeScreen/components/fault.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="fault" style="width: 100%; height: 70px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("fault"));
+
+      var option = {
+        title: [
+          {
+            text: "0%",
+            x: "center",
+            top: "35%",
+            textStyle: {
+              fontSize: "15",
+              color: "#FFFFFF",
+              fontFamily: "DINAlternate-Bold, DINAlternate",
+              foontWeight: "100",
+            },
+          },
+        ],
+        // backgroundColor: "#111",
+        polar: {
+          radius: ["75%", "90%"],
+          center: ["50%", "50%"],
+        },
+        angleAxis: {
+          max: 100,
+          show: false,
+        },
+        radiusAxis: {
+          type: "category",
+          show: true,
+          axisLabel: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            name: "",
+            type: "bar",
+            roundCap: true,
+            barWidth: 90,
+            showBackground: true,
+            backgroundStyle: {
+              color: "rgba(66, 66, 66, .3)",
+            },
+            // data: [1],
+            coordinateSystem: "polar",
+
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                  {
+                    offset: 0,
+                    color: "#717171",
+                  },
+                  {
+                    offset: 1,
+                    color: "#717171",
+                  },
+                ]),
+              },
+            },
+          },
+          // {
+          //     name: '',
+          //     type: 'pie',
+          //     startAngle: 80,
+          //     radius: ['6%'],
+          //     hoverAnimation: false,
+          //     center: ['50%', '50%'],
+          //     itemStyle: {
+          //         color: 'rgba(66, 66, 66, .1)',
+          //         borderWidth: 1,
+          //         borderColor: '#5269EE',
+          //     },
+          //     data: [100],
+          // },
+          {
+            name: "",
+            type: "pie",
+            startAngle: 80,
+            radius: ["100%"],
+            hoverAnimation: false,
+            center: ["50%", "50%"],
+            itemStyle: {
+              color: "rgba(66, 66, 66, .1)",
+              borderWidth: 1,
+              borderColor: "#5269EE",
+            },
+            data: [100],
+          },
+        ],
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/dv/largeScreen/components/offline.vue b/src/views/mes/dv/largeScreen/components/offline.vue
new file mode 100644
index 0000000..0edccc2
--- /dev/null
+++ b/src/views/mes/dv/largeScreen/components/offline.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="offline" style="width: 100%; height: 70px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("offline"));
+
+      var option = {
+        title: [
+          {
+            text: "0%",
+            x: "center",
+            top: "35%",
+            textStyle: {
+              fontSize: "15",
+              color: "#FFFFFF",
+              fontFamily: "DINAlternate-Bold, DINAlternate",
+              foontWeight: "100",
+            },
+          },
+        ],
+        // backgroundColor: "#111",
+        polar: {
+          radius: ["75%", "90%"],
+          center: ["50%", "50%"],
+        },
+        angleAxis: {
+          max: 100,
+          show: false,
+        },
+        radiusAxis: {
+          type: "category",
+          show: true,
+          axisLabel: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            name: "",
+            type: "bar",
+            roundCap: true,
+            barWidth: 90,
+            showBackground: true,
+            backgroundStyle: {
+              color: "rgba(66, 66, 66, .3)",
+            },
+            // data: [5],
+            coordinateSystem: "polar",
+
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                  {
+                    offset: 0,
+                    color: "#717171",
+                  },
+                  {
+                    offset: 1,
+                    color: "#717171",
+                  },
+                ]),
+              },
+            },
+          },
+          // {
+          //     name: '',
+          //     type: 'pie',
+          //     startAngle: 80,
+          //     radius: ['6%'],
+          //     hoverAnimation: false,
+          //     center: ['50%', '50%'],
+          //     itemStyle: {
+          //         color: 'rgba(66, 66, 66, .1)',
+          //         borderWidth: 1,
+          //         borderColor: '#5269EE',
+          //     },
+          //     data: [100],
+          // },
+          {
+            name: "",
+            type: "pie",
+            startAngle: 80,
+            radius: ["100%"],
+            hoverAnimation: false,
+            center: ["50%", "50%"],
+            itemStyle: {
+              color: "rgba(66, 66, 66, .1)",
+              borderWidth: 1,
+              borderColor: "#5269EE",
+            },
+            data: [100],
+          },
+        ],
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/dv/largeScreen/components/online.vue b/src/views/mes/dv/largeScreen/components/online.vue
new file mode 100644
index 0000000..2dea9b1
--- /dev/null
+++ b/src/views/mes/dv/largeScreen/components/online.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="main" style="width: 100%; height: 70px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("main"));
+
+      var option = {
+        title: [
+          {
+            text: "0%",
+            x: "center",
+            top: "35%",
+            textStyle: {
+              fontSize: "15",
+              color: "#FFFFFF",
+              fontFamily: "DINAlternate-Bold, DINAlternate",
+              foontWeight: "100",
+            },
+          },
+        ],
+        // backgroundColor: "#111",
+        polar: {
+          radius: ["75%", "90%"],
+          center: ["50%", "50%"],
+        },
+        angleAxis: {
+          max: 100,
+          show: false,
+        },
+        radiusAxis: {
+          type: "category",
+          show: true,
+          axisLabel: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            name: "",
+            type: "bar",
+            roundCap: true,
+            barWidth: 90,
+            showBackground: true,
+            backgroundStyle: {
+              color: "rgba(66, 66, 66, .3)",
+            },
+            // data: [10],
+            coordinateSystem: "polar",
+
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                  {
+                    offset: 0,
+                    color: "#717171",
+                  },
+                  {
+                    offset: 1,
+                    color: "#717171",
+                  },
+                ]),
+              },
+            },
+          },
+          // {
+          //     name: '',
+          //     type: 'pie',
+          //     startAngle: 80,
+          //     radius: ['6%'],
+          //     hoverAnimation: false,
+          //     center: ['50%', '50%'],
+          //     itemStyle: {
+          //         color: 'rgba(66, 66, 66, .1)',
+          //         borderWidth: 1,
+          //         borderColor: '#5269EE',
+          //     },
+          //     data: [100],
+          // },
+          {
+            name: "",
+            type: "pie",
+            startAngle: 80,
+            radius: ["100%"],
+            hoverAnimation: false,
+            center: ["50%", "50%"],
+            itemStyle: {
+              color: "rgba(66, 66, 66, .1)",
+              borderWidth: 1,
+              borderColor: "#5269EE",
+            },
+            data: [100],
+          },
+        ],
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/dv/largeScreen/components/onlineRate.vue b/src/views/mes/dv/largeScreen/components/onlineRate.vue
new file mode 100644
index 0000000..5d94c8e
--- /dev/null
+++ b/src/views/mes/dv/largeScreen/components/onlineRate.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="onlineRate" style="width: 100%; height: 150px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("onlineRate"));
+
+      let value = "0%";
+      let title = "设备在线率";
+      var option = {
+        title: [
+          {
+            text: "{a|" + value + "}\n{c|" + title + "}",
+            x: "center",
+            top: "35%",
+            textStyle: {
+              rich: {
+                a: {
+                  fontSize: 15,
+                  color: "#ffffff",
+                },
+                c: {
+                  fontSize: 10,
+                  color: "#ffffff",
+                  padding: [5, 0],
+                },
+              },
+            },
+          },
+        ],
+        // backgroundColor: "#111",
+        polar: {
+          radius: ["70%", "95%"],
+          center: ["50%", "50%"],
+        },
+        angleAxis: {
+          max: 100,
+          show: false,
+        },
+        radiusAxis: {
+          type: "category",
+          show: true,
+          axisLabel: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            name: "",
+            type: "bar",
+            roundCap: true,
+            barWidth: 90,
+            showBackground: true,
+            backgroundStyle: {
+              color: "rgba(66, 66, 66, .3)",
+            },
+            // data: [50],
+            coordinateSystem: "polar",
+
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                  {
+                    offset: 0,
+                    color: "#717171",
+                  },
+                  {
+                    offset: 1,
+                    color: "#717171",
+                  },
+                ]),
+              },
+            },
+          },
+          // {
+          //     name: '',
+          //     type: 'pie',
+          //     startAngle: 80,
+          //     radius: ['6%'],
+          //     hoverAnimation: false,
+          //     center: ['50%', '50%'],
+          //     itemStyle: {
+          //         color: 'rgba(66, 66, 66, .1)',
+          //         borderWidth: 1,
+          //         borderColor: '#5269EE',
+          //     },
+          //     data: [100],
+          // },
+          {
+            name: "",
+            type: "pie",
+            startAngle: 80,
+            radius: ["100%"],
+            hoverAnimation: false,
+            center: ["50%", "50%"],
+            itemStyle: {
+              color: "rgba(66, 66, 66, .1)",
+              borderWidth: 1,
+              borderColor: "#5269EE",
+            },
+            data: [100],
+          },
+        ],
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/dv/largeScreen/components/roboticRate.vue b/src/views/mes/dv/largeScreen/components/roboticRate.vue
new file mode 100644
index 0000000..188df48
--- /dev/null
+++ b/src/views/mes/dv/largeScreen/components/roboticRate.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="roboticRate" style="width: 100%; height: 150px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("roboticRate"));
+
+      let value = "0%";
+      let title = "设备在线率";
+      var option = {
+        title: [
+          {
+            text: "{a|" + value + "}\n{c|" + title + "}",
+            x: "center",
+            top: "35%",
+            textStyle: {
+              rich: {
+                a: {
+                  fontSize: 15,
+                  color: "#ffffff",
+                },
+                c: {
+                  fontSize: 10,
+                  color: "#ffffff",
+                  padding: [5, 0],
+                },
+              },
+            },
+          },
+        ],
+        // backgroundColor: "#111",
+        polar: {
+          radius: ["70%", "95%"],
+          center: ["50%", "50%"],
+        },
+        angleAxis: {
+          max: 100,
+          show: false,
+        },
+        radiusAxis: {
+          type: "category",
+          show: true,
+          axisLabel: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            name: "",
+            type: "bar",
+            roundCap: true,
+            barWidth: 90,
+            showBackground: true,
+            backgroundStyle: {
+              color: "rgba(66, 66, 66, .3)",
+            },
+            // data: [30],
+            coordinateSystem: "polar",
+
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                  {
+                    offset: 0,
+                    color: "#717171",
+                  },
+                  {
+                    offset: 1,
+                    color: "#717171",
+                  },
+                ]),
+              },
+            },
+          },
+          // {
+          //     name: '',
+          //     type: 'pie',
+          //     startAngle: 80,
+          //     radius: ['6%'],
+          //     hoverAnimation: false,
+          //     center: ['50%', '50%'],
+          //     itemStyle: {
+          //         color: 'rgba(66, 66, 66, .1)',
+          //         borderWidth: 1,
+          //         borderColor: '#5269EE',
+          //     },
+          //     data: [100],
+          // },
+          {
+            name: "",
+            type: "pie",
+            startAngle: 80,
+            radius: ["100%"],
+            hoverAnimation: false,
+            center: ["50%", "50%"],
+            itemStyle: {
+              color: "rgba(66, 66, 66, .1)",
+              borderWidth: 1,
+              borderColor: "#5269EE",
+            },
+            data: [100],
+          },
+        ],
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/dv/largeScreen/index.vue b/src/views/mes/dv/largeScreen/index.vue
new file mode 100644
index 0000000..b49c8b6
--- /dev/null
+++ b/src/views/mes/dv/largeScreen/index.vue
@@ -0,0 +1,678 @@
+<template>
+  <div class="shopping-classify">
+    <div class="right-menu" id="container">
+      <!-- 头 -->
+      <div style="height: 10%">
+        <el-row type="flex" justify="space-between" style="height: 100%">
+          <el-col :span="10">
+            <div
+              class="grid-content bg-purple"
+              style="display: flex; flex-direction: row-reverse"
+            >
+              <!-- <svg-icon
+                :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+                style="
+                  width: 20px;
+                  height: 20px;
+                  color: #f4deb0;
+                  margin: 0% -70% 1% 0%;
+                "
+                @click="buttoncli"
+              /> -->
+              <img
+                @click="buttoncli"
+                style="height: 40px; margin: 5% 4.3% 0% 0%"
+                src="../../../../assets/images/return.png"
+              /></div
+          ></el-col>
+          <el-col
+            :span="5"
+            style="
+              display: flex;
+              flex-direction: column;
+              justify-content: space-evenly;
+              align-items: center;
+            "
+            ><div style="color: #fff; font-size: 30px; font-weight: 700">
+              {{ this.title }}
+            </div>
+            <div
+              style="color: rgb(9 207 255); font-size: 18px; margin-bottom: 4%"
+            >
+              <span>{{ this.dateYear }}</span> {{ this.dateDay }}
+              <span>{{ this.dateWeek }}</span>
+            </div>
+          </el-col>
+          <el-col :span="10"
+            ><div class="grid-content bg-purple" style="display: flex">
+              <img
+                style="height: 40px; margin: 5% 0% 0% 4%"
+                src="../../../../assets/images/biaotixiugai.png"
+                @click="handleChange"
+              />
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <!-- 第一部分 -->
+      <div style="height: 10%">
+        <el-row type="flex" class="row-bg-1" justify="space-between">
+          <el-col :span="8"
+            ><div class="grid-content bg-purple">
+              <el-row
+                :gutter="8"
+                style="display: flex; justify-content: center"
+              >
+                <el-col :span="3"
+                  ><div class="grid-content bg-purple" style="width: 70px">
+                    <online :message="this.barquantity" /></div
+                ></el-col>
+                <el-col :span="4"
+                  ><div class="grid-content bg-purple" style="margin-top: 10%">
+                    <div style="font-size: 25px">0</div>
+                    <div>当前在线</div>
+                  </div></el-col
+                >
+              </el-row>
+            </div></el-col
+          >
+          <el-col :span="8"
+            ><div class="grid-content bg-purple">
+              <el-row
+                :gutter="8"
+                style="display: flex; justify-content: center"
+              >
+                <el-col :span="3"
+                  ><div class="grid-content bg-purple" style="width: 70px">
+                    <offline :message="this.offlineData" /></div
+                ></el-col>
+                <el-col :span="4"
+                  ><div class="grid-content bg-purple" style="margin-top: 10%">
+                    <div style="font-size: 25px">0</div>
+                    <div>当前离线</div>
+                  </div></el-col
+                >
+              </el-row>
+            </div></el-col
+          >
+          <el-col :span="8"
+            ><div class="grid-content bg-purple">
+              <el-row
+                :gutter="8"
+                style="display: flex; justify-content: center"
+              >
+                <el-col :span="3"
+                  ><div class="grid-content bg-purple" style="width: 70px">
+                    <fault :message="this.faultData" /></div
+                ></el-col>
+                <el-col :span="4"
+                  ><div class="grid-content bg-purple" style="margin-top: 10%">
+                    <div style="font-size: 25px">0</div>
+                    <div>当前故障</div>
+                  </div></el-col
+                >
+              </el-row>
+            </div></el-col
+          >
+        </el-row>
+      </div>
+
+      <!-- 第二部分 -->
+      <div style="height: 80%">
+        <el-row type="flex" class="row-bg-3" justify="space-between">
+          <el-col :span="8"
+            ><div style="display: flex; flex-direction: column; height: 100%">
+              <div style="height: 10%">
+                <el-radio-group
+                  size="mini"
+                  v-model="radio1"
+                  style="
+                    display: flex;
+                    justify-content: flex-end;
+                    margin: 2% 5% 0% 0%;
+                  "
+                >
+                  <el-radio-button :label="1">当前</el-radio-button>
+                  <el-radio-button :label="2">本月</el-radio-button>
+                </el-radio-group>
+              </div>
+              <div style="height: 20%">
+                <div style="height: 100%">
+                  <el-row :gutter="20">
+                    <el-col :span="6"
+                      ><div style="margin-left: 28%">
+                        <onlineRate :message="this.onlineRateData" /></div
+                    ></el-col>
+                    <el-col :span="6"
+                      ><div style="margin: 45% 0% 0% 17%">0</div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 45% 27% 0% 0%; color: #2cc195">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 45% 55% 0% 0%; color: #ec1821">
+                        0
+                      </div></el-col
+                    >
+                  </el-row>
+                </div>
+              </div>
+              <div style="height: 25%">
+                <div style="height: 100%">
+                  <el-row :gutter="24">
+                    <el-col :span="8"
+                      ><div style="margin: 40% 0% 0% 3%">0</div></el-col
+                    >
+                    <el-col :span="8"
+                      ><div style="margin: 40% 7% 0% 0%; color: #f5c959">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="8"
+                      ><div style="margin: 40% 18% 0% 0%">0</div></el-col
+                    >
+                  </el-row>
+                </div>
+              </div>
+              <div style="height: 45%">
+                <div style="height: 100%">
+                  <el-row :gutter="20">
+                    <el-col :span="6"
+                      ><div style="margin: 25% 0% 0% 33%">0</div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 25% 0% 0% 5%; color: #f5c959">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 25% 27% 0% 0%; color: #ec1821">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 25% 60% 0% 0%; color: #2cc195">
+                        0
+                      </div></el-col
+                    >
+                  </el-row>
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div style="display: flex; flex-direction: column; height: 100%">
+              <div style="height: 10%">
+                <el-radio-group
+                  size="mini"
+                  v-model="radio2"
+                  style="
+                    display: flex;
+                    justify-content: flex-end;
+                    margin: 2% 5% 0% 0%;
+                  "
+                >
+                  <el-radio-button :label="1">当前</el-radio-button>
+                  <el-radio-button :label="2">本月</el-radio-button>
+                </el-radio-group>
+              </div>
+              <div style="height: 20%">
+                <div style="height: 100%">
+                  <el-row :gutter="20">
+                    <el-col :span="6"
+                      ><div style="margin-left: 28%">
+                        <roboticRate :message="this.roboticRateData" /></div
+                    ></el-col>
+                    <el-col :span="6"
+                      ><div style="margin: 45% 0% 0% 30%">0</div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 45% 15% 0% 0%; color: #2cc195">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 45% 40% 0% 0%; color: #ec1821">
+                        0
+                      </div></el-col
+                    >
+                  </el-row>
+                </div>
+              </div>
+              <div style="height: 25%">
+                <div style="height: 100%">
+                  <el-row :gutter="24">
+                    <el-col :span="8"
+                      ><div style="margin: 40% 0% 0% 12%">0</div></el-col
+                    >
+                    <el-col :span="8"
+                      ><div style="margin: 40% 0% 0% 2%; color: #f5c959">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="8"
+                      ><div style="margin: 40% 10% 0% 0%">0</div></el-col
+                    >
+                  </el-row>
+                </div>
+              </div>
+              <div style="height: 45%">
+                <div style="height: 100%">
+                  <el-row :gutter="20">
+                    <el-col :span="6"
+                      ><div style="margin: 25% 0% 0% 46%">0</div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 25% 0% 0% 17%; color: #f5c959">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 25% 17% 0% 0%; color: #ec1821">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 25% 50% 0% 0%; color: #2cc195">
+                        0
+                      </div></el-col
+                    >
+                  </el-row>
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div style="display: flex; flex-direction: column; height: 100%">
+              <div style="height: 10%">
+                <el-radio-group
+                  size="mini"
+                  v-model="radio3"
+                  style="
+                    display: flex;
+                    justify-content: flex-end;
+                    margin: 2% 5% 0% 0%;
+                  "
+                >
+                  <el-radio-button :label="1">当前</el-radio-button>
+                  <el-radio-button :label="2">本月</el-radio-button>
+                </el-radio-group>
+              </div>
+              <div style="height: 20%">
+                <div style="height: 100%">
+                  <el-row :gutter="20">
+                    <el-col :span="6"
+                      ><div style="margin-left: 28%">
+                        <AGVrate :message="this.AGVrateData" /></div
+                    ></el-col>
+                    <el-col :span="6"
+                      ><div style="margin: 45% 0% 0% 32%">0</div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 45% 0% 0% 0%; color: #2cc195">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="6"
+                      ><div style="margin: 45% 40% 0% 0%; color: #ec1821">
+                        0
+                      </div></el-col
+                    >
+                  </el-row>
+                </div>
+              </div>
+              <div style="height: 25%">
+                <div style="height: 100%">
+                  <el-row :gutter="24">
+                    <el-col :span="8"
+                      ><div style="margin: 40% 0% 0% 17%">0</div></el-col
+                    >
+                    <el-col :span="8"
+                      ><div style="margin: 40% 0% 0% 6%; color: #f5c959">
+                        0
+                      </div></el-col
+                    >
+                    <el-col :span="8"
+                      ><div style="margin: 40% 4% 0% 0%">0</div></el-col
+                    >
+                  </el-row>
+                </div>
+              </div>
+              <div style="height: 45%">
+                <div style="height: 100%"></div>
+              </div></div
+          ></el-col>
+        </el-row>
+      </div>
+
+      <!--标题修改-->
+      <el-dialog :visible.sync="titleVisible" append-to-body width="30%">
+        <el-form ref="installForm" :model="installForm" label-width="80px">
+          <el-form-item label="标题修改">
+            <el-input
+              maxlength="11"
+              show-word-limit
+              v-model="installForm.name"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="titleVisible = false">取消</el-button>
+          <el-button type="primary" @click="sumitInstall">确认</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import dayjs from "dayjs";
+// import * as statisServer from "@/api/statistics";
+// import { getInfo } from "@/api/user";
+import screenfull from "screenfull";
+import online from "./components/online.vue";
+import offline from "./components/offline.vue";
+import fault from "./components/fault.vue";
+import onlineRate from "./components/onlineRate.vue";
+import roboticRate from "./components/roboticRate.vue";
+import AGVrate from "./components/AGVrate.vue";
+
+export default {
+  components: {
+    online,
+    offline,
+    fault,
+    onlineRate,
+    roboticRate,
+    AGVrate,
+    dayjs,
+  },
+  data() {
+    return {
+      dateDay: null,
+      dateYear: null,
+      dateWeek: null,
+      weekday: [
+        "星期日",
+        "星期一",
+        "星期二",
+        "星期三",
+        "星期四",
+        "星期五",
+        "星期六",
+      ],
+      timer: null,
+
+      screenfull: false,
+      title: "设备监控分析",
+      titleVisible: false,
+      installForm: { name: "" },
+      taskForm: {
+        total_num: 0, // 采样任务百分比 （完成/总数量）
+        completed_num: 0,
+        incompleted_num: 0,
+      },
+      lineChartData: {},
+      totalarr: 0, // 求和
+      month: "", //获取当月合同
+      Contracts: "",
+      barquantity: [],
+      offlineData: [],
+      faultData: [],
+      onlineRateData: [],
+      roboticRateData: [],
+      AGVrateData: [],
+      signarr: [],
+      detection: [],
+      reports: "",
+      issue: "1",
+      accumulation: true,
+      thisYear: false,
+      isFullscreen: false,
+      radio1: 1,
+      radio2: 1,
+      radio3: 1,
+    };
+  },
+
+  created() {
+    this.timer = setInterval(() => {
+      const date = dayjs(new Date());
+      this.dateDay = date.format("HH:mm:ss");
+      this.dateYear = date.format("YYYY-MM-DD");
+      this.dateWeek = date.format(this.weekday[date.day()]);
+    }, 1000);
+    // 监听事件
+    window.addEventListener("resize", this.onresize);
+    this.getList();
+    this.findTasks();
+    this.findContactList();
+    this.findSampleClass();
+    this.findvalid();
+    this.findSortContNumList();
+    this.NumberReports();
+    this.factorNumber();
+  },
+
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+    // 取消监听事件
+    window.removeEventListener("resize", this.onresize);
+  },
+  methods: {
+    // 监听是否全屏状态
+    onresize(event) {
+      // 利用屏幕分辨率和window对象的内高度来判断兼容IE
+      let winFlag = window.innerHeight === window.screen.height;
+      // 利用window全屏标识来判断 -- IE无效
+      let isFull = window.fullScreen || document.webkitIsFullScreen;
+
+      if (isFull === undefined) {
+        this.isFullscreen = winFlag;
+      } else {
+        this.isFullscreen = winFlag || isFull;
+      }
+      // console.log(winFlag); // true全屏   false不是全屏
+    },
+    buttoncli() {
+      const element = document.getElementById("container");
+      if (!screenfull) {
+        this.$message({
+          message: "浏览器不能全屏，安装其他版本试试",
+          type: "warning",
+        });
+        return false;
+      }
+      screenfull.toggle(element);
+      this.findSampleClass();
+      this.findSortContNumList();
+      this.factorNumber();
+    },
+
+    buttoncliArr() {
+      const element = document.getElementById("container");
+      if (!screenfull) {
+        this.$message({
+          message: "浏览器不能全屏，安装其他版本试试",
+          type: "warning",
+        });
+        return false;
+      }
+      screenfull.toggle(element);
+    },
+
+    getList() {
+      //   getInfo().then(res => {
+      //     this.title = res.result.screenName;
+      //   });
+    },
+
+    // 任务
+    findTasks() {
+      //   statisServer.findCompleteTask({ type: 1 }).then(res => {
+      //     if (res.code === 200) {
+      //       const taskForm = res.result.find(i => i.name === "报告编制任务");
+      //       this.taskForm.total_num = taskForm.totalCnt;
+      //       this.taskForm.completed_num = Number(
+      //         taskForm.totalCnt - taskForm.completeCnt
+      //       ).toFixed(0);
+      //       this.taskForm.incompleted_num = taskForm.completeCnt;
+      //     }
+      //   });
+    },
+    //合同总数
+    findContactList() {
+      //   statisServer.findValidContractsForPass11Month().then(res => {
+      //     if (res.code === 200) {
+      //       this.lineChartData = res.result || [];
+      //       // 求和
+      //       this.lineChartData.contactNum.forEach(item => {
+      //         this.totalarr += item;
+      //       });
+      //       //获取当月合同
+      //       this.month = this.lineChartData.contactNum.pop();
+      //     }
+      //   });
+    },
+
+    //样品类别
+    findSampleClass() {
+      //   statisServer.findStoredSampleClassificationCnt({ limit: 6 }).then(res => {
+      //     if (res.code === 200) {
+      //       var arr = [];
+      //       var barData = res.result.xNameData;
+      //       var barquantity = res.result.xValData;
+      //       //
+      //       barData.forEach((item, i) => {
+      //         arr.push({
+      //           name: item,
+      //           value: barquantity[i]
+      //         });
+      //       });
+      //       this.barquantity = arr;
+      //     }
+      //   });
+    },
+
+    findvalid() {
+      //   statisServer.findValidContracts({ type: 0 }).then(res => {
+      //     if (res.code === 200) {
+      //       this.Contracts = res.result.cusSum;
+      //     }
+      //   });
+    },
+    //签合同排名
+    findSortContNumList() {
+      //   statisServer.findSortContNum({ type: 1, limit: 5 }).then(res => {
+      //     if (res.code === 200) {
+      //       var arr = [];
+      //       var barData = res.result.xNameData;
+      //       var barquantity = res.result.xValData;
+      //       //
+      //       barData.forEach((item, i) => {
+      //         arr.push({
+      //           code: item,
+      //           fundPost: barquantity[i]
+      //         });
+      //       });
+      //       arr.sort((a, b) => {
+      //         return b.fundPost - a.fundPost;
+      //       }); //升序
+      //       this.signarr = arr.slice(0, 10);
+      //     }
+      //   });
+    },
+    //签发报告数
+    NumberReports() {
+      //   statisServer.getReport({ type: this.issue }).then(res => {
+      //     if (res.code === 200) {
+      //       this.reports = res.result;
+      //     }
+      //   });
+    },
+    //因子数
+    factorNumber() {
+      //   statisServer.detectorFactor().then(res => {
+      //     if (res.code === 200) {
+      //       var arr = res.result;
+      //       arr.sort((a, b) => {
+      //         return b.value - a.value;
+      //       }); //升序
+      //       this.detection = arr.slice(0, 10);
+      //     }
+      //   });
+    },
+
+    handleChange() {
+      this.titleVisible = true;
+    },
+    //修改确认
+    sumitInstall() {
+      //   statisServer.updateName(this.installForm).then(res => {
+      //     if (res.code === 200) {
+      //       this.$notify({
+      //         title: "修改成功",
+      //         message: res.message,
+      //         type: "success"
+      //       });
+      //       this.titleVisible = false;
+      //       this.getList();
+      //     }
+      //   });
+    },
+    accumulationClick() {
+      this.issue = 2;
+      this.accumulation = false;
+      this.thisYear = true;
+      this.NumberReports();
+    },
+    thisYearClick() {
+      this.issue = 1;
+      this.accumulation = true;
+      this.thisYear = false;
+      this.NumberReports();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+#container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100vh;
+  background: url("../../../../assets/images/zhubeijing.png") center center
+    no-repeat;
+  background-size: 100% 100%;
+}
+.row-bg-1 {
+  height: 70px;
+  color: #fff;
+  text-align: center;
+}
+.row-bg-3 {
+  height: 100%;
+  text-align: center;
+  color: #fff;
+  font-size: 20px;
+  font-weight: 700;
+}
+.row-bg-4 {
+  color: #8bdbe6;
+  font-size: 25px;
+  margin-top: 27%;
+  font-weight: 500;
+}
+.row-bg-5 {
+  height: 365px;
+  text-align: center;
+  color: #fff;
+  font-size: 20px;
+  font-weight: 700;
+}
+</style>
diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue
index 45bed37..4ee802d 100644
--- a/src/views/mes/dv/machinery/index.vue
+++ b/src/views/mes/dv/machinery/index.vue
@@ -16,7 +16,7 @@
         <div class="head-container">
           <el-tree
             :data="machineryTypeOptions"
-            :props="defaultProps"
+            :props="defaultPropss"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
@@ -27,7 +27,14 @@
       </el-col>
       <!--设备数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="设备编码" prop="machineryCode">
             <el-input
               v-model="queryParams.machineryCode"
@@ -47,8 +54,16 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
 
@@ -61,7 +76,8 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['mes:dv:machinery:add']"
-            >新增</el-button>
+              >新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -72,7 +88,8 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['mes:dv:machinery:edit']"
-            >修改</el-button>
+              >修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -83,7 +100,8 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['mes:dv:machinery:remove']"
-            >删除</el-button>
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -93,7 +111,8 @@
               size="mini"
               @click="handleImport"
               v-hasPermi="['mes:dv:machinery:import']"
-            >导入</el-button>
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -103,33 +122,86 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['mes:dv:machinery:export']"
-            >导出</el-button>
+              >导出</el-button
+            >
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          :data="machineryList"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="handleView(scope.row)"
-                  v-hasPermi="['mes:dv:machinery:query']"
-                >{{scope.row.machineryCode}}</el-button>
-              </template>
-          </el-table-column>
-          <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
-          <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
-          <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
-          <el-table-column label="所属车间" align="center" key="machineryTypeName" prop="machineryTypeName"  :show-overflow-tooltip="true" />
-          <el-table-column label="设备状态" align="center" key="status" prop="status" >
+          <el-table-column
+            label="设备编码"
+            width="120"
+            align="center"
+            key="machineryCode"
+            prop="machineryCode"
+          >
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.mes_machinery_status" :value="scope.row.status"/>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleView(scope.row)"
+                v-hasPermi="['mes:dv:machinery:query']"
+                >{{ scope.row.machineryCode }}</el-button
+              >
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+          <el-table-column
+            label="设备名称"
+            min-width="120"
+            align="left"
+            key="machineryName"
+            prop="machineryName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="品牌"
+            align="left"
+            key="machineryBrand"
+            prop="machineryBrand"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="规格型号"
+            align="left"
+            key="machinerySpec"
+            prop="machinerySpec"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="所属车间"
+            align="center"
+            key="workshopName"
+            prop="workshopName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="设备状态"
+            align="center"
+            key="status"
+            prop="status"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.mes_machinery_status"
+                :value="scope.row.status"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            width="160"
+          >
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -147,20 +219,22 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['mes:dv:machinery:edit']"
-              >修改</el-button>
+                >修改</el-button
+              >
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['mes:dv:machinery:remove']"
-              >删除</el-button>              
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
 
         <pagination
-          v-show="total>0"
+          v-show="total > 0"
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
@@ -174,79 +248,223 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="设备编码" prop="itemCode">
-              <el-input v-model="form.machineryCode" readonly="readonly" maxlength="64" v-if="optType == 'view'"/>
-              <el-input v-model="form.machineryCode" placeholder="请输入设备编码" maxlength="64" v-else/>
+            <el-form-item label="设备编码" prop="machineryCode">
+              <el-input
+                v-model="form.machineryCode"
+                readonly="readonly"
+                maxlength="64"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.machineryCode"
+                placeholder="请输入设备编码"
+                maxlength="64"
+                v-else
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="设备名称" prop="itemName">
-              <el-input v-model="form.machineryName"  maxlength="255" readonly="readonly" v-if="optType=='view'" />
-              <el-input v-model="form.machineryName" placeholder="请输入设备名称" maxlength="255" v-else/>
+            <el-form-item label="设备名称" prop="machineryName">
+              <el-input
+                v-model="form.machineryName"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.machineryName"
+                placeholder="请输入设备名称"
+                maxlength="255"
+                v-else
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="品牌" prop="machineryBrand">
-              <el-input v-model="form.machineryBrand"  maxlength="255" readonly="readonly" v-if="optType=='view'" />
-              <el-input v-model="form.machineryBrand"  placeholder="请输入品牌" maxlength="255" v-else/>
+              <el-input
+                v-model="form.machineryBrand"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.machineryBrand"
+                placeholder="请输入品牌"
+                maxlength="255"
+                v-else
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item  label="设备分类" prop="machineryTypeId">
-              <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" disabled v-if="optType=='view'"  />
-              <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" placeholder="请选择所属分类" v-else :disable-branch-nodes='true' />
+            <el-form-item label="设备分类" prop="machineryTypeId">
+              <treeselect
+                v-model="form.machineryTypeId"
+                :options="machineryTypeOptions"
+                :normalizer="normalizer"
+                placeholder="请选择设备类型"
+                @select="handleNode"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="ip地址" prop="ip">
+              <el-input
+                v-model="form.ip"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.ip"
+                placeholder="请输入ip地址"
+                maxlength="255"
+                v-else
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="端口号" prop="port">
+              <el-input
+                v-model="form.port"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.port"
+                placeholder="请输入端口号"
+                maxlength="255"
+                v-else
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="规格型号" prop="machinerySpec">
-              <el-input v-model="form.machinerySpec" type="textarea" maxlength="255" readonly="readonly" v-if="optType=='view'" />
-              <el-input v-model="form.machinerySpec" type="textarea" placeholder="请输入规格型号" maxlength="255" v-else/>
+              <el-input
+                v-model="form.machinerySpec"
+                type="textarea"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.machinerySpec"
+                type="textarea"
+                placeholder="请输入规格型号"
+                maxlength="255"
+                v-else
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所属车间" prop="workshopId">
-            <el-select v-model="form.workshopId" placeholder="请选择车间">
-              <el-option
-                v-for="item in workshopOptions"
-                :key="item.workshopId"
-                :label="item.workshopName"
-                :value="item.workshopId"
-              ></el-option>
-            </el-select>
-            </el-form-item>
+            <!-- <el-form-item label="所属车间" prop="workshopName">
+              <el-select
+                v-model="form.workshopName"
+                placeholder="请选择车间"
+                style="width: 100%"
+                value-key="workshopId"
+                @change="handleAccompanyId"
+              >
+                <el-option
+                  v-for="item in workshopOptions"
+                  :key="item.workshopId"
+                  :label="item.workshopName"
+                  :value="item"
+                ></el-option>
+              </el-select>
+            </el-form-item> -->
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="关联代码程序" prop="idList">
+              <el-select
+                v-model="form.idList"
+                placeholder="请选择关联代码程序"
+                clearable
+                filterable
+                multiple
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in listTypeArr"
+                  :key="dict.codeId"
+                  :label="dict.codeName"
+                  :value="dict.codeId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="异常报警通知" prop="userName">
+              <el-input
+                style="width: 90%"
+                v-model="userName"
+                :readonly="true"
+              />
+              <el-button type="text" @click="addInvolvedUserId"
+                >&nbsp;选择通知人</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" readonly v-if="optType=='view'"></el-input>
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" v-else></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                readonly
+                v-if="optType == 'view'"
+              ></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+                v-else
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 物料导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
       <el-upload
         ref="upload"
         :limit="1"
@@ -263,10 +481,17 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的设备数据
+            <el-checkbox v-model="upload.updateSupport" />
+            是否更新已经存在的设备数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -274,26 +499,55 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      title="添加"
+      :visible.sync="addInvolvedUserIdVisible"
+      center
+      width="70%"
+    >
+      <!-- 人员选择 -->
+      <personnelSelection
+        ref="checked"
+        :inputValue="inputName"
+        @getSelectList="getSelectList"
+      />
+      <div style="margin-top: -97px; text-align: center">
+        <el-button @click="addInvolvedUserIdVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveInvolvedUserId">保存</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery";
+import {
+  listMachinery,
+  getMachinery,
+  delMachinery,
+  addMachinery,
+  updateMachinery,
+  listMes,
+  UserArr,
+  machineryUsers,
+} from "@/api/mes/dv/machinery";
 import { listMachinerytype } from "@/api/mes/dv/machinerytype";
 import { listAllWorkshop } from "@/api/mes/md/workshop";
-import {genCode} from "@/api/system/autocode/rule"
+import { genCode } from "@/api/system/autocode/rule";
 import { getToken } from "@/utils/auth";
+import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import personnelSelection from "../../../components/personnelSelection.vue";
 
 export default {
   name: "Machinery",
-  dicts: ['sys_yes_no','mes_machinery_status'],
-  components: { Treeselect },
+  dicts: ["sys_yes_no", "mes_machinery_status"],
+  components: { Treeselect, personnelSelection },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: false,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -314,7 +568,7 @@ export default {
       // 设备类型树选项
       machineryTypeOptions: [],
       //车间选项
-      workshopOptions:[],
+      workshopOptions: [],
       // 是否显示弹出层
       open: false,
       // 设备类型名称
@@ -322,10 +576,15 @@ export default {
       //自动生成物料编码标识
       autoGenFlag: false,
       // 表单参数
-      form: {},
-      defaultProps: {
+      form: {
+        idList: "",
+        workshopCode: "",
+        workshopName: "",
+        workshopId: "214",
+      },
+      defaultPropss: {
         children: "children",
-        label: "machineryTypeName"
+        label: "machineryTypeName",
       },
       // 用户导入参数
       upload: {
@@ -340,8 +599,10 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/mes/dv/machinery/importData"
+        url: process.env.VUE_APP_BASE_API + "/mes/dv/machinery/importData",
       },
+      machineryIdsArr: null,
+      listTypeArr: {},
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -356,32 +617,55 @@ export default {
         workshopId: null,
         workshopCode: null,
         workshopName: null,
-        status: null
+        status: null,
       },
 
+      addInvolvedUserIdVisible: false,
+      // 部门名称
+      deptName: undefined,
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      userName: undefined,
+
+      UserAdd: {
+        userIds: [],
+        machineryId: "",
+      },
+
+      inputName: "",
+
+      queryParamsdata: {},
+
       // 表单校验
       rules: {
         machineryCode: [
           { required: true, message: "设备编码不能为空", trigger: "blur" },
-          { max: 64, message: '设备编码长度必须小于64个字符', trigger: 'blur' }
+          { max: 64, message: "设备编码长度必须小于64个字符", trigger: "blur" },
         ],
         machineryName: [
-          { required: true, message: "设备名称不能为空", trigger: "blur" }
-        ],
-        workshopId: [
-          { required: true, message: "车间不能为空",trigger: "blur"}
+          { required: true, message: "设备名称不能为空", trigger: "blur" },
         ],
+        // workshopId: [
+        //   { required: true, message: "车间不能为空", trigger: "blur" },
+        // ],
         machineryTypeId: [
           { required: true, message: "设备分类不能为空", trigger: "blur" },
-        ]
-      }
+        ],
+        // workshopName: [
+        //   { required: true, message: "所属车间不能为空", trigger: "blur" },
+        // ],
+      },
     };
   },
   watch: {
     // 根据设备分类名称筛选分类树
     machineryTypeName(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   created() {
     this.getList();
@@ -391,16 +675,15 @@ export default {
     /** 查询物料编码列表 */
     getList() {
       this.loading = true;
-      listMachinery(this.queryParams).then(response => {
-          this.machineryList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
+      listMachinery(this.queryParams).then((response) => {
+        this.machineryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
-    getWorkshops(){
-      listAllWorkshop().then( response => {
-        this.workshopOptions =response.data;
+    getWorkshops() {
+      listAllWorkshop().then((response) => {
+        this.workshopOptions = response.data;
       });
     },
     /** 转换设备类型数据结构 */
@@ -411,15 +694,18 @@ export default {
       return {
         id: node.machineryTypeId,
         label: node.machineryTypeName,
-        children: node.children
+        children: node.children,
       };
     },
-	/** 查询设备类型下拉树结构 */
+    /** 查询设备类型下拉树结构 */
     getTreeselect() {
-      listMachinerytype().then(response => {
-        debugger;
+      listMachinerytype().then((response) => {
         this.machineryTypeOptions = [];
-        const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
+        const data = this.handleTree(
+          response.data,
+          "machineryTypeId",
+          "parentTypeId"
+        )[0];
         this.machineryTypeOptions.push(data);
       });
     },
@@ -431,8 +717,15 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.machineryTypeId = data.machineryTypeId;
+      this.queryParamsdata = data;
       this.handleQuery();
     },
+    // 节点单击事件
+    handleNode(data) {
+      console.log(data);
+      this.form.machineryTypeName = data.machineryTypeName;
+      this.form.machineryTypeCode = data.code;
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -449,7 +742,7 @@ export default {
         machineryTypeId: null,
         machineryTypeCode: null,
         machineryTypeName: null,
-        workshopId: null,
+        workshopId: "214",
         workshopCode: null,
         workshopName: null,
         status: "STOP",
@@ -457,9 +750,10 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null       
+        updateTime: null,
+        idList: "",
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -474,17 +768,17 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.machineryId);
+      this.ids = selection.map((item) => item.machineryId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
       this.getTreeselect();
       this.getWorkshops();
       const machineryId = row.machineryId || this.ids;
-      getMachinery(machineryId).then(response => {
+      getMachinery(machineryId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "查看设备信息";
@@ -493,46 +787,73 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      debugger;
       this.reset();
       this.getTreeselect();
       this.getWorkshops();
-      if(this.queryParams.machineryTypeId != 0){
-        this.form.machineryTypeId = this.queryParams.machineryTypeId;
-      }
+      this.userName = "";
+      this.inputName = "";
+      // if (this.queryParamsdata.machineryTypeId != 0) {
+      //   this.form = this.queryParamsdata;
+      // }
       this.optType = "add";
       this.open = true;
       this.title = "新增设备";
+      genCode("MACHINERY_CODE").then((response) => {
+        this.form.machineryCode = response;
+      });
+    },
+
+    saveInvolvedUserId() {
+      this.addInvolvedUserIdVisible = false;
+      // this.$emit("getSelectList", this.selectList);
+    },
+
+    //选择车间
+    handleAccompanyId(val) {
+      this.form.workshopCode = val.workshopCode;
+      this.form.workshopName = val.workshopName;
+      this.form.workshopId = val.workshopId;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
       this.getWorkshops();
-      const machineryId = row.machineryId || this.ids
-      getMachinery(machineryId).then(response => {
+      const machineryId = row.machineryId || this.ids;
+      getMachinery(machineryId).then((response) => {
         this.form = response.data;
+        let arr = response.data.cadCodeMachineryList.map((item) => item.codeId);
+        this.form.idList = arr;
         this.open = true;
         this.title = "修改设备";
         this.optType = "edit";
       });
+      this.UserAdd.machineryId = row.machineryId;
+      machineryUsers(this.UserAdd).then((response) => {
+        this.userName = response.data.map((item) => item.nickName);
+        this.inputName = response.data;
+      });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.machineryId != undefined) {
-            updateMachinery(this.form).then(response => {
+            updateMachinery(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
+              this.exceptionAlert();
               this.open = false;
               this.getList();
             });
           } else {
-            debugger;
-            addMachinery(this.form).then(response => {
+            addMachinery(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              if (response.data != null) {
+                this.UserAdd.machineryId = response.data;
+                this.exceptionAlert();
+              }
             });
           }
         }
@@ -541,18 +862,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const machineryIds = row.machineryId || this.ids;
-      this.$modal.confirm('确认删除数据项？').then(function() {
-        return delMachinery(machineryIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("确认删除数据项？")
+        .then(function () {
+          return delMachinery(machineryIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/dv/machinery/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/dv/machinery/export",
+        {
+          ...this.queryParams,
+        },
+        `user_${new Date().getTime()}.xlsx`
+      );
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -561,8 +890,11 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('mes/dv/machinery/importTemplate', {
-      }, `md_item_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/dv/machinery/importTemplate",
+        {},
+        `md_item_${new Date().getTime()}.xlsx`
+      );
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -573,7 +905,13 @@ export default {
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
       this.getList();
     },
     // 提交上传文件
@@ -581,15 +919,35 @@ export default {
       this.$refs.upload.submit();
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('MACHINERY_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("MACHINERY_CODE").then((response) => {
           this.form.machineryCode = response;
         });
-      }else{
+      } else {
         this.form.machineryCode = null;
       }
-    }
-  }
+    },
+
+    // 添加授权使用人
+    addInvolvedUserId() {
+      this.addInvolvedUserIdVisible = true;
+      // this.$refs.checked.addInvolvedUserId(); // 这样可以直接访问子组件方法,用ref拿子组件方法
+    },
+
+    //子组件传的数据
+    getSelectList(value) {
+      this.userName = "";
+      this.userName = value.map((item) => item.nickName);
+      this.UserAdd.userIds = value.map((item) => item.userId);
+    },
+
+    //新增设备关联通知人
+    exceptionAlert() {
+      UserArr(this.UserAdd).then((response) => {
+        // this.$modal.msgSuccess("新增设备关联通知人成功");
+      });
+    },
+  },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue
index 1c4d4ad..bcb1314 100644
--- a/src/views/mes/dv/machinerytype/index.vue
+++ b/src/views/mes/dv/machinerytype/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="类型名称" prop="machineryTypeName">
         <el-input
           v-model="queryParams.machineryTypeName"
@@ -10,7 +17,11 @@
         />
       </el-form-item>
       <el-form-item label="是否启用" prop="enableFlag">
-        <el-select v-model="queryParams.enableFlag" placeholder="选择是或否" clearable>
+        <el-select
+          v-model="queryParams.enableFlag"
+          placeholder="选择是或否"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.sys_yes_no"
             :key="dict.value"
@@ -20,8 +31,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -30,17 +49,28 @@
       :data="machinerytypeList"
       row-key="machineryTypeId"
       default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
       <el-table-column label="设备类型编码" prop="machineryTypeCode" />
-      <el-table-column label="设备类型名称" align="center" prop="machineryTypeName" />
-      <el-table-column label="是否启用" align="center" prop="enableFlag" >
+      <el-table-column
+        label="设备类型名称"
+        align="center"
+        prop="machineryTypeName"
+      />
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enableFlag"
+          />
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -48,14 +78,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:dv:machinerytype:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['mes:dv:machinerytype:add']"
-          >新增</el-button>
+            >新增</el-button
+          >
           <el-button
             v-if="scope.row.parentTypeId != 0"
             size="mini"
@@ -63,7 +95,8 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:dv:machinerytype:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -74,39 +107,70 @@
         <el-row>
           <el-col :span="24" v-if="form.parentTypeId !== 0">
             <el-form-item label="父类型" prop="parentTypeId">
-              <treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" />
+              <treeselect
+                v-model="form.parentTypeId"
+                :options="machinerytypeOptions"
+                :normalizer="normalizer"
+                placeholder="请选择父类型"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="设备类型名称" prop="machineryTypeName">
-              <el-input v-model="form.machineryTypeName" placeholder="请输入设备类型名称" />
+              <el-input
+                v-model="form.machineryTypeName"
+                placeholder="请输入设备类型名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="默认设备类型" prop="code">
+              <el-select v-model="form.code" placeholder="请选择默认设备类型">
+                <el-option
+                  v-for="dict in dict.type.dv_m_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否启用" prop="enableFlag">
-              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+              <el-radio-group
+                v-model="form.enableFlag"
+                disabled
+                v-if="optType == 'view'"
+              >
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
               <el-radio-group v-model="form.enableFlag" v-else>
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -120,19 +184,25 @@
 </template>
 
 <script>
-import { listMachinerytype, getMachinerytype, delMachinerytype, addMachinerytype, updateMachinerytype } from "@/api/mes/dv/machinerytype";
+import {
+  listMachinerytype,
+  getMachinerytype,
+  delMachinerytype,
+  addMachinerytype,
+  updateMachinerytype,
+} from "@/api/mes/dv/machinerytype";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Machinerytype",
-  dicts: ['sys_yes_no'],
+  dicts: ["sys_yes_no", "dv_m_type"],
   components: {
-    Treeselect
+    Treeselect,
   },
   data() {
     return {
-      optType:undefined,
+      optType: undefined,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -158,15 +228,18 @@ export default {
       // 表单校验
       rules: {
         parentTypeId: [
-          { required: true, message: "父类型不能为空", trigger: "blur" }
+          { required: true, message: "父类型不能为空", trigger: "blur" },
         ],
         machineryTypeName: [
-          { required: true, message: "设备类型名称不能为空", trigger: "blur" }
+          { required: true, message: "设备类型名称不能为空", trigger: "blur" },
         ],
         enableFlag: [
-          { required: true, message: "是否启用不能为空", trigger: "blur" }
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
         ],
-      }
+        code: [
+          { required: true, message: "请默认设备类型不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -176,8 +249,12 @@ export default {
     /** 查询设备类型列表 */
     getList() {
       this.loading = true;
-      listMachinerytype(this.queryParams).then(response => {
-        this.machinerytypeList = this.handleTree(response.data, "machineryTypeId", "parentTypeId");
+      listMachinerytype(this.queryParams).then((response) => {
+        this.machinerytypeList = this.handleTree(
+          response.data,
+          "machineryTypeId",
+          "parentTypeId"
+        );
         this.loading = false;
       });
     },
@@ -189,15 +266,19 @@ export default {
       return {
         id: node.machineryTypeId,
         label: node.machineryTypeName,
-        children: node.children
+        children: node.children,
       };
     },
-	/** 查询设备类型下拉树结构 */
+    /** 查询设备类型下拉树结构 */
     getTreeselect() {
-      listMachinerytype().then(response => {
+      listMachinerytype().then((response) => {
         debugger;
         this.machinerytypeOptions = [];
-        const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
+        const data = this.handleTree(
+          response.data,
+          "machineryTypeId",
+          "parentTypeId"
+        )[0];
         this.machinerytypeOptions.push(data);
       });
     },
@@ -213,12 +294,12 @@ export default {
         machineryTypeName: null,
         parentTypeId: 1,
         ancestors: null,
-        enableFlag: 'Y',
+        enableFlag: "Y",
         remark: null,
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -250,7 +331,7 @@ export default {
       if (row != null) {
         this.form.parentTypeId = row.machineryTypeId;
       }
-      getMachinerytype(row.machineryTypeId).then(response => {
+      getMachinerytype(row.machineryTypeId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改设备类型";
@@ -258,16 +339,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.machineryTypeId != null) {
-            updateMachinerytype(this.form).then(response => {
+            updateMachinerytype(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addMachinerytype(this.form).then(response => {
+            addMachinerytype(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -278,13 +359,19 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除设备类型编号为"' + row.machineryTypeId + '"的数据项？').then(function() {
-        return delMachinerytype(row.machineryTypeId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
+      this.$modal
+        .confirm(
+          '是否确认删除设备类型编号为"' + row.machineryTypeId + '"的数据项？'
+        )
+        .then(function () {
+          return delMachinerytype(row.machineryTypeId);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue
index cbe6e5e..1bc75f6 100644
--- a/src/views/mes/dv/repair/index.vue
+++ b/src/views/mes/dv/repair/index.vue
@@ -294,7 +294,7 @@ export default {
   components: {Repairline,MachinerySelectSingle},
   data() {
     return {
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -427,6 +427,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加设备维修单";
+      genCode('REPAIR_CODE').then(response =>{
+        this.form.repairCode = response;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/mes/dv/route/index.vue b/src/views/mes/dv/route/index.vue
new file mode 100644
index 0000000..1dc48c6
--- /dev/null
+++ b/src/views/mes/dv/route/index.vue
@@ -0,0 +1,501 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="线路名称" prop="lineName">
+        <el-input
+          v-model="queryParams.lineName"
+          placeholder="请输入线路名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select
+          v-model="queryParams.enableFlag"
+          placeholder="请选择是否启用"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in whetherEnabled"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['mes:dv:dvsubject:add']"
+            >新增线路</el-button
+          >
+        </el-col>
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col> -->
+      </el-col>
+
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="AGV线路编码"
+        width="120"
+        align="center"
+        prop="lineCode"
+      />
+      <el-table-column label="AGV线路名称" align="center" prop="lineName" />
+      <el-table-column label="所属车间" align="center" prop="workshopName" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.enableFlag == 'Y'"
+            >是</span
+          >
+          <span
+            class="el-table-column-span-1"
+            v-if="scope.row.enableFlag == 'N'"
+            >否</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="AGV线路编码" prop="lineCode">
+              <el-input
+                v-model="form.lineCode"
+                placeholder="请输入AGV线路编码"
+                maxlength="64"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label-width="120px"
+              label="AGV线路名称"
+              prop="lineName"
+            >
+              <el-input
+                v-model="form.lineName"
+                placeholder="请输入AGV线路名称"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <!-- <el-form-item label="所属车间" prop="workshopId">
+              <el-select
+                v-model="form.workshopId"
+                placeholder="请选择车间"
+                style="width: 100%"
+                value-key="workshopId"
+              >
+                <el-option
+                  v-for="item in workshopOptions"
+                  :key="item.workshopId"
+                  :label="item.workshopName"
+                  :value="item.workshopId"
+                ></el-option>
+              </el-select>
+            </el-form-item> -->
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enableFlag">
+              <el-radio-group v-model="form.enableFlag">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.remark"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  findProAgvline,
+  findLineCode,
+  addProAgvline,
+  updateProAgvline,
+  deleteProAgvline,
+} from "@/api/mes/dv/route";
+import { listAllWorkshop } from "@/api/mes/md/workshop";
+import { genCode } from "@/api/system/autocode/rule";
+export default {
+  name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_dvsubject_type"],
+  data() {
+    return {
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      id: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        lineName: null,
+        enableFlag: null,
+      },
+      //车间选项
+      workshopOptions: [],
+      // 表单参数
+      form: {},
+      whetherEnabled: [
+        {
+          value: "Y",
+          label: "是",
+        },
+        {
+          value: "N",
+          label: "否",
+        },
+      ],
+      // 表单校验
+      rules: {
+        lineCode: [
+          { required: true, message: "AGV线路编码不能为空", trigger: "blur" },
+        ],
+        workshopId: [
+          { required: true, message: "所属车间不能为空", trigger: "blur" },
+        ],
+        lineName: [
+          { required: true, message: "AGV线路名称不能为空", trigger: "blur" },
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 列表 */
+    getList() {
+      this.loading = true;
+      findProAgvline(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getWorkshops() {
+      listAllWorkshop().then((response) => {
+        this.workshopOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.getList();
+      this.open = false;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        subjectId: null,
+        proAgvlineId: null,
+        lineCode: null,
+        lineName: null,
+        workshopId: "214",
+        enableFlag: "Y",
+        remark: null,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.id = selection.map((item) => item.proAgvlineId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getWorkshops();
+      this.open = true;
+      this.title = "新增AGV线路";
+      findLineCode().then((response) => {
+        this.form.lineCode = response.data.lineCode;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getWorkshops();
+      this.form = row;
+      this.form.subjectId = row.proAgvlineId;
+      this.open = true;
+      this.title = "修改AGV线路";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.subjectId != null) {
+            updateProAgvline(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "修改成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addProAgvline(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "新增成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      deleteProAgvline({ proAgvlineId: row.proAgvlineId }).then((response) => {
+        this.$modal
+          .confirm("是否确认删除当前的数据项？")
+          .then(() => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "删除成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.getList();
+            }
+          })
+          .catch(() => {});
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      //   this.download(
+      //     "dv/dvsubject/export",
+      //     {
+      //       ...this.queryParams,
+      //     },
+      //     `dvsubject_${new Date().getTime()}.xlsx`
+      //   );
+    },
+    //自动生成物料编码
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        findLineCode().then((response) => {
+          this.form.lineCode = response.data.lineCode;
+        });
+      } else {
+        this.form.lineCode = null;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+
+.el-table-column-span {
+  background-color: #e8f4ff;
+  border-color: #d1e9ff;
+  color: #1890ff;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+.el-table-column-span-1 {
+  background-color: #ffeded;
+  border-color: #ffdbdb;
+  color: #ff4949;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/mes/dv/siteConfiguration/index.vue b/src/views/mes/dv/siteConfiguration/index.vue
new file mode 100644
index 0000000..bef46da
--- /dev/null
+++ b/src/views/mes/dv/siteConfiguration/index.vue
@@ -0,0 +1,531 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="线路名称" prop="siteName">
+        <el-input
+          v-model="queryParams.siteName"
+          placeholder="请输入线路名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select
+          v-model="queryParams.enableFlag"
+          placeholder="请选择是否启用"
+          clearable
+          style="width: 150px"
+        >
+          <el-option
+            v-for="dict in whetherEnabled"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col style="width: 90%">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['mes:dv:dvsubject:add']"
+            >新增站点</el-button
+          >
+        </el-col>
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['mes:dv:dvsubject:edit']"
+            >修改</el-button
+          >
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['mes:dv:dvsubject:remove']"
+            >删除</el-button
+          >
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['mes:dv:dvsubject:export']"
+            >导出</el-button
+          >
+        </el-col> -->
+      </el-col>
+
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="dvsubjectList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="AGV站点编码" align="center" prop="siteCode" />
+<!--      <el-table-column-->
+<!--        label="AGV站点编码11"-->
+<!--        width="120"-->
+<!--        align="center"-->
+<!--        key="siteCode"-->
+<!--        prop="siteCode"-->
+<!--        v-if="1"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            @click="handleView(scope.row)"-->
+<!--            v-hasPermi="['mes:dv:route']"-->
+<!--            >{{ scope.row.siteCode }}</el-button-->
+<!--          >-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="AGV站点名称" align="center" prop="siteName" />
+      <el-table-column label="所属线路" align="center" prop="agvlineName" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
+          <span class="el-table-column-span" v-if="scope.row.enableFlag == 'Y'"
+            >是</span
+          >
+          <span
+            class="el-table-column-span-1"
+            v-if="scope.row.enableFlag == 'N'"
+            >否</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="AGV站点编码" prop="siteCode">
+              <el-input
+                v-model="form.siteCode"
+                placeholder="请输入AGV站点编码"
+                maxlength="64"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label-width="120px"
+              label="AGV站点名称"
+              prop="siteName"
+            >
+              <el-input
+                v-model="form.siteName"
+                placeholder="请输入AGV站点名称"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属线路" prop="agvlineId">
+              <el-select
+                v-model="form.agvlineId"
+                placeholder="请选择所属线路"
+                style="width: 100%"
+                value-key="proAgvlineId"
+              >
+                <el-option
+                  v-for="item in workshopOptions"
+                  :key="item.proAgvlineId"
+                  :label="item.lineName"
+                  :value="item.proAgvlineId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enableFlag">
+              <el-radio-group v-model="form.enableFlag">
+                <el-radio label="Y">是</el-radio>
+                <el-radio label="N">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="PLC IP地址" prop="plcIpAddress">
+              <el-input
+                v-model="form.plcIpAddress"
+                placeholder="请输PLC IP地址"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.remark"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { findProAgvline } from "@/api/mes/dv/route";
+import {
+  findProAgvsite,
+  findSiteCode,
+  addProAgvsite,
+  updateProAgvsite,
+  deleteProAgvsite,
+} from "@/api/mes/dv/siteConfiguration";
+import { genCode } from "@/api/system/autocode/rule";
+export default {
+  name: "Dvsubject",
+  dicts: ["sys_yes_no", "mes_dvsubject_type"],
+  data() {
+    return {
+      autoGenFlag: false,
+      // 遮罩层
+      loading: false,
+      // 选中数组s
+      id: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 列表
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        siteName: null,
+        enableFlag: null,
+      },
+      //车间选项
+      workshopOptions: [],
+      // 表单参数
+      form: {
+        proAgvsiteId: "",
+        siteCode: "",
+        siteName: "",
+        agvlineId: "",
+        agvlineName: "",
+        enableFlag: "Y",
+        remark: "",
+      },
+      whetherEnabled: [
+        {
+          value: "Y",
+          label: "是",
+        },
+        {
+          value: "N",
+          label: "否",
+        },
+      ],
+      // 表单校验
+      rules: {
+        siteCode: [
+          { required: true, message: "AGV站点编码不能为空", trigger: "blur" },
+        ],
+        agvlineId: [
+          { required: true, message: "所属线路不能为空", trigger: "blur" },
+        ],
+        siteName: [
+          { required: true, message: "AGV站点名称不能为空", trigger: "blur" },
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 列表 */
+    getList() {
+        this.loading = true;
+      findProAgvsite(this.queryParams).then((response) => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getWorkshops() {
+      findProAgvline(this.queryParams).then((response) => {
+        this.workshopOptions = response.rows;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.getList();
+      this.open = false;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        subjectId: null,
+        proAgvsiteId: null,
+        siteCode: null,
+        siteName: null,
+        agvlineId: null,
+        enableFlag: "Y",
+        remark: null,
+        agvlineName: null,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.id = selection.map((item) => item.proAgvsiteId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getWorkshops();
+      this.open = true;
+      this.title = "新增AGV站点";
+      findSiteCode().then((response) => {
+        this.form.siteCode = response.data.siteCode;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getWorkshops();
+      this.form = row;
+      this.form.subjectId = row.proAgvsiteId;
+      this.open = true;
+      this.title = "修改AGV站点";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.subjectId != null) {
+            updateProAgvsite(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "修改成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addProAgvsite(this.form).then((response) => {
+              if (response.code === 200) {
+                this.$notify({
+                  title: "新增成功",
+                  message: response.msg,
+                  type: "success",
+                });
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      deleteProAgvsite({ proAgvsiteId: row.proAgvsiteId }).then((response) => {
+        this.$modal
+          .confirm("是否确认删除当前的数据项？")
+          .then(() => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "删除成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.getList();
+            }
+          })
+          .catch(() => {});
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      //   this.download(
+      //     "dv/dvsubject/export",
+      //     {
+      //       ...this.queryParams,
+      //     },
+      //     `dvsubject_${new Date().getTime()}.xlsx`
+      //   );
+    },
+    //自动生成物料编码
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        findSiteCode().then((response) => {
+          this.form.siteCode = response.data.siteCode;
+        });
+      } else {
+        this.form.siteCode = null;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card .el-card__header {
+  padding: 10px 20px;
+  background: #f3f2f2;
+}
+
+.el-table-column-span {
+  background-color: #e8f4ff;
+  border-color: #d1e9ff;
+  color: #1890ff;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+.el-table-column-span-1 {
+  background-color: #ffeded;
+  border-color: #ffdbdb;
+  color: #ff4949;
+  display: inline-block;
+  padding: 0 15px;
+  line-height: 30px;
+  font-size: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/mes/dv/subject/index.vue b/src/views/mes/dv/subject/index.vue
index c216165..4851fe9 100644
--- a/src/views/mes/dv/subject/index.vue
+++ b/src/views/mes/dv/subject/index.vue
@@ -281,7 +281,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
diff --git a/src/views/mes/md/bom/index.vue b/src/views/mes/md/bom/index.vue
index 400b4a5..01aaadd 100644
--- a/src/views/mes/md/bom/index.vue
+++ b/src/views/mes/md/bom/index.vue
@@ -464,7 +464,7 @@ export default {
         maxStock: 0,
         remark: undefined        
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
diff --git a/src/views/mes/md/client/index.vue b/src/views/mes/md/client/index.vue
index bf00ab1..878c8ff 100644
--- a/src/views/mes/md/client/index.vue
+++ b/src/views/mes/md/client/index.vue
@@ -353,7 +353,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -485,7 +485,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -510,6 +510,9 @@ export default {
       this.open = true;
       this.title = "添加客户";
       this.optType = "add";
+      genCode('CLIENT_CODE').then(response =>{
+        this.form.clientCode = response;
+      });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/md/mditem/components/sop.vue b/src/views/mes/md/mditem/components/sop.vue
index ed48944..b4c1361 100644
--- a/src/views/mes/md/mditem/components/sop.vue
+++ b/src/views/mes/md/mditem/components/sop.vue
@@ -160,12 +160,10 @@ export default{
         },
         //图片上传成功
         handleImgUplaoded(imgUrl){
-            console.log(imgUrl);
             this.form.sopUrl = imgUrl;
         },
         //图片移除
         handleImgRemoved(imgUrl){
-            console.log(imgUrl);
             this.form.sopUrl = null;            
         },
         //提交
diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue
index 3866b9c..1506532 100644
--- a/src/views/mes/md/mditem/index.vue
+++ b/src/views/mes/md/mditem/index.vue
@@ -242,7 +242,7 @@
           <el-col :span="12">
             <el-form-item  label="物料/产品分类" prop="itemTypeId">
               <treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" disabled v-if="optType=='view'"  />
-              <treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" placeholder="请选择所属分类" v-else :disable-branch-nodes="true"/>
+              <treeselect v-model="form.itemTypeId" :options="itemTypeOptions" :show-count="true" placeholder="请选择所属分类" v-else/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -531,7 +531,7 @@ export default {
         optType: undefined,
         remark: undefined        
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -572,6 +572,9 @@ export default {
       this.optType = "add";
       this.open = true;
       this.title = "新增物料/产品";
+      genCode('ITEM_CODE').then(response =>{
+          this.form.itemCode = response;
+        });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/mes/md/pallet/index.vue b/src/views/mes/md/pallet/index.vue
new file mode 100644
index 0000000..a94728f
--- /dev/null
+++ b/src/views/mes/md/pallet/index.vue
@@ -0,0 +1,640 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--数据-->
+      <el-col>
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="托盘编码" prop="palletCode">
+            <el-input
+              v-model="queryParams.palletCode"
+              placeholder="请输入托盘编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['mes:md:mditem:add']"
+              >新增</el-button
+            >
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['mes:md:mditem:edit']"
+              >修改</el-button
+            >
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDeleteData"
+              v-hasPermi="['mes:md:mditem:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['mes:md:mditem:import']"
+              >导入</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['mes:md:mditem:export']"
+              >导出</el-button
+            >
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="itemList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column
+            label="托盘码"
+            width="120"
+            align="center"
+            key="palletCode"
+            prop="palletCode"
+          >
+          </el-table-column>
+
+          <el-table-column
+            label="托盘尺寸"
+            align="center"
+            key="palletSize"
+            prop="palletSize"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="动裁承重"
+            align="center"
+            key="dynamicBear"
+            prop="dynamicBear"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.dynamicBear + "kg" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="静载承重"
+            align="center"
+            key="staticBear"
+            prop="staticBear"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.staticBear + "kg" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="当前位置"
+            align="center"
+            key="currentLocation"
+            prop="currentLocation"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['mes:md:mditem:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['mes:md:mditem:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改物料产品编码对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="托盘编码" prop="palletCode">
+              <el-input
+                v-model="form.palletCode"
+                readonly="readonly"
+                maxlength="64"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.palletCode"
+                placeholder="请输入托盘编码"
+                maxlength="64"
+                v-else
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view'"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="托盘尺寸" prop="palletSize">
+              <el-input
+                v-model="form.palletSize"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              />
+              <el-input
+                v-model="form.palletSize"
+                placeholder="请输入托盘尺寸"
+                maxlength="255"
+                v-else
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="动载承重" prop="dynamicBear">
+              <el-input
+                v-model="form.dynamicBear"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              >
+                <i
+                  slot="suffix"
+                  style="
+                    font-style: normal;
+                    margin-right: 10px;
+                    line-height: 30px;
+                    color: #1e1e1e;
+                  "
+                  >kg</i
+                >
+              </el-input>
+              <el-input
+                v-model="form.dynamicBear"
+                placeholder="请输入动载承重"
+                maxlength="255"
+                v-else
+              >
+                <i
+                  slot="suffix"
+                  style="
+                    font-style: normal;
+                    margin-right: 10px;
+                    line-height: 30px;
+                    color: #1e1e1e;
+                  "
+                  >kg</i
+                >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="静载承重" prop="staticBear">
+              <el-input
+                v-model="form.staticBear"
+                maxlength="255"
+                readonly="readonly"
+                v-if="optType == 'view'"
+              >
+                <i
+                  slot="suffix"
+                  style="
+                    font-style: normal;
+                    margin-right: 10px;
+                    line-height: 30px;
+                    color: #1e1e1e;
+                  "
+                  >kg</i
+                >
+              </el-input>
+              <el-input
+                v-model="form.staticBear"
+                placeholder="请输入静载承重"
+                maxlength="255"
+                v-else
+              >
+                <i
+                  slot="suffix"
+                  style="
+                    font-style: normal;
+                    margin-right: 10px;
+                    line-height: 30px;
+                    color: #1e1e1e;
+                  "
+                  >kg</i
+                >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
+        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button @click="cancel">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 物料导入对话框 -->
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" />
+            是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listMdItem,
+  delMdItem,
+  addMdItem,
+  updateMdItem,
+  findPalletCode,
+  batchDeleteProPallet,
+  exportProPallet,
+} from "@/api/mes/md/pallet";
+
+import { genCode } from "@/api/system/autocode/rule";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Pallet",
+  dicts: ["sys_yes_no", "mes_item_product"],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料产品表格数据
+      itemList: null,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      //弹框的操作类型 view add edit
+      optType: undefined,
+      //自动生成物料编码标识
+      autoGenFlag: false,
+      // 日期范围
+      dateRange: [],
+      //单位列表
+      measureOptions: [],
+      // 表单参数
+      form: {},
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/mes/md/mditem/importData",
+      },
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        palletCode: undefined,
+        itemName: undefined,
+      },
+      // 表单校验
+      rules: {
+        palletCode: [
+          { required: true, message: "托盘编码不能为空", trigger: "blur" },
+          {
+            max: 64,
+            message: "物料/产品编码长度必须小于64个字符",
+            trigger: "blur",
+          },
+        ],
+        itemName: [
+          { required: true, message: "物托盘尺寸不能为空", trigger: "blur" },
+        ],
+        unitOfMeasure: [
+          { required: true, message: "单位不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询物料编码列表 */
+    getList() {
+      this.loading = false;
+      listMdItem(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        proPalletId: undefined,
+        palletCode: undefined,
+        palletSize: undefined,
+        dynamicBear: undefined,
+        staticBear: undefined,
+        currentLocation: undefined,
+      };
+      this.autoGenFlag = true;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.proPalletId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.optType = "add";
+      this.open = true;
+      this.title = "新增托盘";
+      findPalletCode().then((response) => {
+        this.form.palletCode = response.data.palletCode;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form = row;
+      this.open = true;
+      this.optType = "edit";
+      this.title = "修改";
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.proPalletId != undefined) {
+            updateMdItem(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            debugger;
+            addMdItem(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const itemIds = row.proPalletId;
+      delMdItem({ proPalletId: itemIds }).then((response) => {
+        this.$modal
+          .confirm("是否确认删除当前的数据项？")
+          .then(() => {
+            if (response.code === 200) {
+              this.$notify({
+                title: "删除成功",
+                message: response.msg,
+                type: "success",
+              });
+              this.getList();
+            }
+          })
+          .catch(() => {});
+      });
+    },
+    /** 批量删除按钮操作 */
+    handleDeleteData() {
+      const itemIds = this.ids;
+      this.$modal
+        .confirm("是否确认删除班次？")
+        .then(function () {
+          return batchDeleteProPallet(itemIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/propallet/exportProPallet",
+        {
+          ...this.queryParams,
+        },
+        `calplan_${new Date().getTime()}.xlsx`
+      );
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      // this.upload.title = "物料/产品导入";
+      // this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      // this.download(
+      //   "mes/md/mditem/importTemplate",
+      //   {},
+      //   `md_item_${new Date().getTime()}.xlsx`
+      // );
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    //自动生成物料编码
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        findPalletCode().then((response) => {
+          this.form.palletCode = response.data.palletCode;
+        });
+      } else {
+        this.form.palletCode = null;
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/mes/md/vendor/index.vue b/src/views/mes/md/vendor/index.vue
index 53d892d..00ccbec 100644
--- a/src/views/mes/md/vendor/index.vue
+++ b/src/views/mes/md/vendor/index.vue
@@ -388,7 +388,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -516,7 +516,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -541,6 +541,9 @@ export default {
       this.open = true;
       this.title = "添加供应商";
       this.optType = "add";
+      genCode('VENDOR_CODE').then(response =>{
+        this.form.vendorCode = response;
+      });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/md/workshop/index.vue b/src/views/mes/md/workshop/index.vue
index 15d2f4f..7ece110 100644
--- a/src/views/mes/md/workshop/index.vue
+++ b/src/views/mes/md/workshop/index.vue
@@ -188,7 +188,7 @@ export default {
   dicts: ['sys_yes_no'],
   data() {
     return {
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -271,7 +271,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -296,6 +296,9 @@ export default {
       this.open = true;
       this.title = "添加车间";
       this.optType = "add";
+        genCode('WORKSHOP_CODE').then(response =>{
+          this.form.workshopCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue
index f94c6d7..5203464 100644
--- a/src/views/mes/md/workstation/index.vue
+++ b/src/views/mes/md/workstation/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-row>
         <el-col :span="8">
           <el-form-item label="工作站编码" prop="workstationCode">
@@ -24,7 +31,10 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="所在车间名称" prop="workshopName">
-            <el-select v-model="queryParams.workshopId" placeholder="请选择车间">
+            <el-select
+              v-model="queryParams.workshopId"
+              placeholder="请选择车间"
+            >
               <el-option
                 v-for="item in workshopOptions"
                 :key="item.workshopId"
@@ -39,19 +49,27 @@
         <el-col :span="8">
           <el-form-item label="所属工序" prop="processName">
             <el-select v-model="queryParams.processId" placeholder="请选择工序">
-                <el-option
-                  v-for="item in processOptions"
-                  :key="item.processId"
-                  :label="item.processName"
-                  :value="item.processId"
-                ></el-option>
-              </el-select>
+              <el-option
+                v-for="item in processOptions"
+                :key="item.processId"
+                :label="item.processName"
+                :value="item.processId"
+              ></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-col>
       </el-row>
@@ -66,7 +84,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:md:workstation:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -77,7 +96,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:md:workstation:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,7 +108,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:md:workstation:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -98,33 +119,61 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:md:workstation:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="workstationList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="workstationList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工作站编号" align="center" prop="workstationCode" >
+      <el-table-column label="工作站编号" align="center" prop="workstationCode">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:md:workstation:query']"
-          >{{scope.row.workstationCode}}</el-button>
+            >{{ scope.row.workstationCode }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column label="工作站名称" align="center" prop="workstationName" />
-      <el-table-column label="工作站地点" align="center" prop="workstationAddress" />
-      <el-table-column label="所在车间名称" align="center" prop="workshopName" />
+      <el-table-column
+        label="工作站名称"
+        align="center"
+        prop="workstationName"
+      />
+      <el-table-column
+        label="工作站地点"
+        align="center"
+        prop="workstationAddress"
+      />
+      <el-table-column
+        label="所在车间名称"
+        align="center"
+        prop="workshopName"
+      />
       <el-table-column label="所属工序" align="center" prop="processName" />
       <el-table-column label="是否启用" align="center" prop="enableFlag">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enableFlag"
+          />
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -132,20 +181,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:md:workstation:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:md:workstation:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -158,71 +209,98 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="工作站编号" prop="workstationCode">
-              <el-input v-model="form.workstationCode" placeholder="请输入工作站编码" />
+              <el-input
+                v-model="form.workstationCode"
+                placeholder="请输入工作站编码"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="工作站名称" prop="workstationName">
-              <el-input v-model="form.workstationName" placeholder="请输入工作站名称" />
+              <el-input
+                v-model="form.workstationName"
+                placeholder="请输入工作站名称"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="工作站地点" prop="workstationAddress">
-              <el-input v-model="form.workstationAddress" placeholder="请输入工作站地点" />
+              <el-input
+                v-model="form.workstationAddress"
+                placeholder="请输入工作站地点"
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="所在车间" prop="workshopId">
-                <el-select v-model="form.workshopId" placeholder="请选择车间">
-                  <el-option
-                    v-for="item in workshopOptions"
-                    :key="item.workshopId"
-                    :label="item.workshopName"
-                    :value="item.workshopId"
-                  ></el-option>
-                </el-select>
+              <el-select
+                v-model="form.workshopId"
+                style="width: 100%"
+                placeholder="请选择车间"
+              >
+                <el-option
+                  v-for="item in workshopOptions"
+                  :key="item.workshopId"
+                  :label="item.workshopName"
+                  :value="item.workshopId"
+                ></el-option>
+              </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="所属工序" prop="processId">
-              <el-select v-model="form.processId" placeholder="请选择工序">
+              <el-select
+                v-model="form.processId"
+                multiple
+                style="width: 100%"
+                placeholder="请选择工序"
+              >
                 <el-option
                   v-for="item in processOptions"
                   :key="item.processId"
                   :label="item.processName"
-                  :value="item.processId"
+                  :value="item.processId + ''"
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>        
+          </el-col>
           <el-col :span="8">
             <el-form-item label="是否启用" prop="enableFlag">
-              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+              <el-radio-group
+                v-model="form.enableFlag"
+                disabled
+                v-if="optType == 'view'"
+              >
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
               <el-radio-group v-model="form.enableFlag" v-else>
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -230,26 +308,48 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-divider content-position="center" v-if="form.workstationId !=null">工作站资源</el-divider>
-      <MachinerySelectSingle ref="machinerySelect" @onSelected="onMachineryAdd"></MachinerySelectSingle>
-      <el-row v-if="form.workstationId !=null">
-        <el-col :span=24>
+      <el-divider content-position="center" v-if="form.workstationId != null"
+        >工作站资源</el-divider
+      >
+      <MachinerySelectSingle
+        ref="machinerySelect"
+        @onSelected="onMachineryAdd"
+      ></MachinerySelectSingle>
+      <el-row v-if="form.workstationId != null">
+        <el-col :span="24">
           <el-carousel trigger="click" type="card" :autoplay="false">
             <el-carousel-item>
-              <el-card shadow="always" style="width:450px">
+              <el-card shadow="always" style="width: 450px">
                 <div slot="header">
                   <span>设备资源</span>
-                  <el-button style="float:right; padding: 3px 0" @click="handleMachineryAdd" v-if="optType !='view'" type="text">新增</el-button>
+                  <span v-if="optTypebutton">
+                    <el-button
+                      style="float: right; padding: 3px 0"
+                      @click="handleMachineryAdd"
+                      v-if="optType != 'view'"
+                      type="text"
+                      >新增</el-button
+                    >
+                  </span>
                 </div>
-                <WorkStationMachine ref="machineryList" :optType="optType" :workstationId="form.workstationId" style="align:center"></WorkStationMachine>                
+                <WorkStationMachine
+                  ref="machineryList"
+                  :optType="optType"
+                  :workstationId="form.workstationId"
+                  style="align: center"
+                ></WorkStationMachine>
               </el-card>
             </el-carousel-item>
-            <el-carousel-item>
+            <!-- <el-carousel-item>
               <el-card shadow="always" style="width:400px">
                 <div slot="header">
                   <span>人力资源</span>
@@ -257,8 +357,8 @@
                 </div>
                 <Workstationworker ref="postList" :optType="optType" :workstationId="form.workstationId"></Workstationworker>
               </el-card>
-            </el-carousel-item>
-            <el-carousel-item>
+            </el-carousel-item> -->
+            <!-- <el-carousel-item>
               <el-card shadow="always" style="width:400px">
                 <div slot="header">
                   <span>工装夹具</span>
@@ -266,12 +366,14 @@
                 </div>
                 <WorkStationTool ref="toolList" :optType="optType" :workstationId="form.workstationId"></WorkStationTool>
               </el-card>
-            </el-carousel-item>
+            </el-carousel-item> -->
           </el-carousel>
         </el-col>
       </el-row>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
         <el-button type="primary" @click="submitForm" v-else>保 存</el-button>
         <el-button @click="cancel">关 闭</el-button>
       </div>
@@ -280,35 +382,50 @@
 </template>
 
 <script>
-import { listWorkstation, getWorkstation, delWorkstation, addWorkstation, updateWorkstation } from "@/api/mes/md/workstation";
+import {
+  listWorkstation,
+  getWorkstation,
+  delWorkstation,
+  addWorkstation,
+  updateWorkstation,
+} from "@/api/mes/md/workstation";
 //设备资源选择与保存
 import WorkStationMachine from "./components/machine";
 import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
-import {addWorkstationmachine} from "@/api/mes/md/workstationmachine";
+import {
+  listWorkstationmachine,
+  addWorkstationmachine,
+} from "@/api/mes/md/workstationmachine";
 //人力资源选择与保存
 import Workstationworker from "./components/worker";
 
 //工装夹具资源选择与保存
 import WorkStationTool from "./components/tool";
-import {getTreeList} from "@/api/mes/wm/warehouse"
-import {listAllProcess} from "@/api/mes/pro/process";
-import {genCode} from "@/api/system/autocode/rule";
+import { getTreeList } from "@/api/mes/wm/warehouse";
+import { listAllProcess } from "@/api/mes/pro/process";
+import { genCode } from "@/api/system/autocode/rule";
 import { listAllWorkshop } from "@/api/mes/md/workshop";
+
 export default {
   name: "Workstation",
-  dicts: ['sys_yes_no'],
-  components: {WorkStationMachine,MachinerySelectSingle,Workstationworker,WorkStationTool},
+  dicts: ["sys_yes_no"],
+  components: {
+    WorkStationMachine,
+    MachinerySelectSingle,
+    Workstationworker,
+    WorkStationTool,
+  },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: true,
       optType: undefined,
-      warehouseInfo:[],
-      warehouseOptions:[],
-      warehouseProps:{
+      warehouseInfo: [],
+      warehouseOptions: [],
+      warehouseProps: {
         multiple: false,
-        value: 'pId',
-        label: 'pName',
+        value: "pId",
+        label: "pName",
       },
       // 遮罩层
       loading: true,
@@ -325,9 +442,9 @@ export default {
       // 工作站表格数据
       workstationList: [],
       //车间选项
-      workshopOptions:[],
+      workshopOptions: [],
       //工序选项
-      processOptions:[],
+      processOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -349,27 +466,29 @@ export default {
         locationId: null,
         areaId: null,
         enableFlag: null,
+        workstationId: null,
       },
+      optTypebutton: true,
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         workstationCode: [
-          { required: true, message: "工作站编号不能为空", trigger: "blur" }
+          { required: true, message: "工作站编号不能为空", trigger: "blur" },
         ],
         workstationName: [
-          { required: true, message: "工作站名称不能为空", trigger: "blur" }
+          { required: true, message: "工作站名称不能为空", trigger: "blur" },
         ],
         enableFlag: [
-          { required: true, message: "是否启用不能为空", trigger: "blur" }
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
         ],
         workshopId: [
-          { required: true, message: "请选择所属车间", trigger: "blur" }
+          { required: true, message: "请选择所属车间", trigger: "blur" },
         ],
         processId: [
-          { required: true, message: "请选择所属工序", trigger: "blur" }
-        ]        
-      }
+          { required: true, message: "请选择所属工序", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -382,45 +501,52 @@ export default {
     /** 查询工作站列表 */
     getList() {
       this.loading = true;
-      listWorkstation(this.queryParams).then(response => {
+      listWorkstation(this.queryParams).then((response) => {
         this.workstationList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
     //查询车间信息
-    getWorkshops(){
-      listAllWorkshop().then( response => {        
+    getWorkshops() {
+      listAllWorkshop().then((response) => {
         this.workshopOptions = response.data;
       });
     },
     //查询工序信息
-    getProcess(){
-      listAllProcess().then( response =>{
+    getProcess() {
+      listAllProcess().then((response) => {
         this.processOptions = response.data;
       });
     },
     //获取仓库
-    getWarehouseList(){
-      getTreeList().then( response =>{        
+    getWarehouseList() {
+      getTreeList().then((response) => {
         this.warehouseOptions = response.data;
-        this.warehouseOptions.map(w =>{
-          w.children.map(l =>{
-                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');                  
-                  l.children = JSON.parse(lstr);
+        this.warehouseOptions.map((w) => {
+          w.children.map((l) => {
+            let lstr = JSON.stringify(l.children)
+              .replace(/locationId/g, "lId")
+              .replace(/areaId/g, "pId")
+              .replace(/areaName/g, "pName");
+            l.children = JSON.parse(lstr);
           });
-            
-          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');  
-          w.children =  JSON.parse(wstr); 
 
+          let wstr = JSON.stringify(w.children)
+            .replace(/warehouseId/g, "wId")
+            .replace(/locationId/g, "pId")
+            .replace(/locationName/g, "pName");
+          w.children = JSON.parse(wstr);
         });
-        let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
+        let ostr = JSON.stringify(this.warehouseOptions)
+          .replace(/warehouseId/g, "pId")
+          .replace(/warehouseName/g, "pName");
         this.warehouseOptions = JSON.parse(ostr);
       });
     },
-        //选择默认的仓库、库区、库位
-    handleWarehouseChanged(obj){
-      if(obj !=null){
+    //选择默认的仓库、库区、库位
+    handleWarehouseChanged(obj) {
+      if (obj != null) {
         this.form.warehouseId = obj[0];
         this.form.locationId = obj[1];
         this.form.areaId = obj[2];
@@ -438,7 +564,7 @@ export default {
         workstationCode: null,
         workstationName: null,
         workstationAddress: null,
-        workshopId: null,
+        workshopId: "214",
         workshopCode: null,
         workshopName: null,
         processId: null,
@@ -447,14 +573,14 @@ export default {
         warehouseId: null,
         locationId: null,
         areaId: null,
-        enableFlag: 'Y',
+        enableFlag: "Y",
         remark: null,
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -464,7 +590,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams ={
+      this.queryParams = {
         pageNum: 1,
         pageSize: 10,
         workstationCode: null,
@@ -486,9 +612,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.workstationId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.workstationId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -497,13 +623,16 @@ export default {
       this.open = true;
       this.title = "添加工作站";
       this.optType = "add";
+      genCode("WORKSTATION_CODE").then((response) => {
+        this.form.workstationCode = response;
+      });
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
       this.getWorkshops();
       const workstationId = row.workstationId || this.ids;
-      getWorkstation(workstationId).then(response => {
+      getWorkstation(workstationId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "查看车间信息";
@@ -514,26 +643,42 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.getWorkshops();
-      const workstationId = row.workstationId || this.ids
-      getWorkstation(workstationId).then(response => {
+      const workstationId = row.workstationId || this.ids;
+      getWorkstation(workstationId).then((response) => {
         this.form = response.data;
+        this.form.processId = response.data.processId.split(",");
+        console.log(this.form.processId);
         this.open = true;
         this.title = "修改工作站";
         this.optType = "edit";
       });
+      var queryParams = {
+        pageNum: 1,
+        pageSize: 1000,
+        workstationId: workstationId,
+      };
+      listWorkstationmachine(queryParams).then((response) => {
+        if (response.total == 1) {
+          this.optTypebutton = false;
+        } else {
+          this.optTypebutton = true;
+        }
+      });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.workstationId != null) {
-            updateWorkstation(this.form).then(response => {
+            this.form.processId = this.form.processId.join(",");
+            updateWorkstation(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addWorkstation(this.form).then(response => {
+            this.form.processId = this.form.processId.join(",");
+            addWorkstation(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -545,51 +690,59 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const workstationIds = row.workstationId || this.ids;
-      this.$modal.confirm('是否确认删除工作站？').then(function() {
-        return delWorkstation(workstationIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除工作站？")
+        .then(function () {
+          return delWorkstation(workstationIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/md/workstation/export', {
-        ...this.queryParams
-      }, `workstation_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/md/workstation/export",
+        {
+          ...this.queryParams,
+        },
+        `workstation_${new Date().getTime()}.xlsx`
+      );
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('WORKSTATION_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("WORKSTATION_CODE").then((response) => {
           this.form.workstationCode = response;
         });
-      }else{
+      } else {
         this.form.workstationCode = null;
       }
     },
     //设备资源选择弹出
-    handleMachineryAdd(){
+    handleMachineryAdd() {
       this.$refs.machinerySelect.showFlag = true;
     },
     //设备资源选择回调
-    onMachineryAdd(rows){
-      debugger
+    onMachineryAdd(rows) {
+      debugger;
       this.loading = true;
       rows.workstationId = this.form.workstationId;
-      addWorkstationmachine(rows).then(response =>{
+      addWorkstationmachine(rows).then((response) => {
         this.$refs.machineryList.getList();
         this.loading = false;
       });
     },
     //人力资源-岗位新增
-    handlePostAdd(){
+    handlePostAdd() {
       this.$refs.postList.handleAdd();
     },
     //工装夹具资源新增
-    handleToolTypeAdd(){
+    handleToolTypeAdd() {
       this.$refs.toolList.handleAdd();
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index d75427e..aa39bd5 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -414,8 +414,6 @@ export default {
         workstationId: null,
         workstationCode: null,
         workstationName: null,
-        routeId: null,
-        routeCode: null,
         processId: null,
         processCode: null,
         processName: null,
@@ -605,8 +603,6 @@ export default {
         this.form.processId = row.processId;
         this.form.processCode = row.processCode;
         this.form.processName = row.processName;
-        this.form.routeId = row.routeId;
-        this.form.routeCode = row.routeCode;
         this.form.isCheck = row.isCheck;
         if(row.isCheck == 'N'){
           this.form.quantityUncheck = 0;
diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue
index ecc9649..d0ecbc0 100644
--- a/src/views/mes/pro/process/index.vue
+++ b/src/views/mes/pro/process/index.vue
@@ -1,122 +1,196 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="工序编码" prop="processCode">
-        <el-input
-          v-model="queryParams.processCode"
-          placeholder="请输入工序编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工序名称" prop="processName">
-        <el-input
-          v-model="queryParams.processName"
-          placeholder="请输入工序名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否启用" prop="enableFlag">
-        <el-input
-          v-model="queryParams.enableFlag"
-          placeholder="请输入是否启用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <el-row :gutter="20">
+      <!--分类数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="processTypeName"
+            placeholder="请输入类型名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="machineryTypeOptions"
+            :props="defaultPropss"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+        >
+          <el-form-item label="工序编码" prop="processCode">
+            <el-input
+              v-model="queryParams.processCode"
+              placeholder="请输入工序编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="工序名称" prop="processName">
+            <el-input
+              v-model="queryParams.processName"
+              placeholder="请输入工序名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="是否启用" prop="enableFlag">
+            <el-input
+              v-model="queryParams.enableFlag"
+              placeholder="请输入是否启用"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['mes:pro:process:add']"
-        >新增</el-button>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['mes:pro:process:add']"
+              >新增</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['mes:pro:process:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['mes:pro:process:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['mes:pro:process:export']"
+              >导出</el-button
+            >
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="processList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="工序编码" align="center" prop="processCode">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click="handleView(scope.row)"
+                v-hasPermi="['mes:pro:process:query']"
+                >{{ scope.row.processCode }}</el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="工序名称"
+            align="center"
+            prop="processName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column label="是否启用" align="center" prop="enableFlag">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_yes_no"
+                :value="scope.row.enableFlag"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="备注"
+            align="center"
+            prop="remark"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['mes:pro:process:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['mes:pro:process:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['mes:pro:process:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['mes:pro:process:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['mes:pro:process:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工序编码" align="center" prop="processCode" >
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleView(scope.row)"
-            v-hasPermi="['mes:pro:process:query']"
-          >{{scope.row.processCode}}</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="工序名称" align="center" prop="processName" :show-overflow-tooltip="true"/>
-      <el-table-column label="是否启用" align="center" prop="enableFlag">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:process:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:pro:process:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -129,38 +203,70 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="工序编码" prop="processCode">
-              <el-input v-model="form.processCode" placeholder="请输入工序编码" />
+              <el-input
+                v-model="form.processCode"
+                placeholder="请输入工序编码"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="工序名称" prop="processName">
-              <el-input v-model="form.processName" placeholder="请输入工序名称" />
+              <el-input
+                v-model="form.processName"
+                placeholder="请输入工序名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="工序类型" prop="processTypeId">
+              <treeselect
+                v-model="form.processTypeId"
+                :options="machineryTypeOptions"
+                :normalizer="normalizer"
+                v-if="optType == 'view'"
+              />
+              <treeselect
+                v-model="form.processTypeId"
+                :options="machineryTypeOptions"
+                :normalizer="normalizer"
+                placeholder="请选择所属分类"
+                v-else
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="是否启用" prop="enableFlag">
-               <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+              <el-radio-group
+                v-model="form.enableFlag"
+                disabled
+                v-if="optType == 'view'"
+              >
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
               <el-radio-group v-model="form.enableFlag" v-else>
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -168,22 +274,38 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="工序说明" prop="attention">
-              <el-input v-model="form.attention" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.attention"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-divider content-position="center" v-if="form.processId !=null">操作步骤</el-divider>
-      <Processcontent v-if="form.processId !=null" :optType="optType" :processId="form.processId"></Processcontent>
+      <el-divider content-position="center" v-if="form.processId != null"
+        >操作步骤</el-divider
+      >
+      <Processcontent
+        v-if="form.processId != null"
+        :optType="optType"
+        :processId="form.processId"
+      ></Processcontent>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -192,17 +314,27 @@
 </template>
 
 <script>
-import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/mes/pro/process";
+import {
+  listProcess,
+  getProcess,
+  delProcess,
+  addProcess,
+  updateProcess,
+} from "@/api/mes/pro/process";
 import Processcontent from "./content.vue";
-import {genCode} from "@/api/system/autocode/rule"
+import { genCode } from "@/api/system/autocode/rule";
+import { listMachinerytype } from "@/api/mes/pro/processType";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
 export default {
   name: "Process",
-  dicts: ['sys_yes_no'],
-  components: {Processcontent},
+  dicts: ["sys_yes_no"],
+  components: { Treeselect,Processcontent },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -229,36 +361,87 @@ export default {
         processCode: null,
         processName: null,
         enableFlag: null,
+        processTypeName: null,
+        processTypeId: null,
       },
       // 表单参数
       form: {},
       // 表单校验
+      // 设备类型名称
+      // 设备类型树选项
+      machineryTypeOptions: [],
+      processTypeName: undefined,
+      defaultPropss: {
+        children: "children",
+        label: "processTypeName",
+      },
       rules: {
         processCode: [
-          { required: true, message: "工序编码不能为空", trigger: "blur" }
+          { required: true, message: "工序编码不能为空", trigger: "blur" },
         ],
         processName: [
-          { required: true, message: "工序名称不能为空", trigger: "blur" }
+          { required: true, message: "工序名称不能为空", trigger: "blur" },
         ],
         enableFlag: [
-          { required: true, message: "是否启用不能为空", trigger: "blur" }
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
+  watch: {
+    // 根据设备分类名称筛选分类树
+    processTypeName(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
   created() {
     this.getList();
+    this.getTreeselect();
   },
   methods: {
     /** 查询生产工序列表 */
     getList() {
       this.loading = true;
-      listProcess(this.queryParams).then(response => {
+      listProcess(this.queryParams).then((response) => {
         this.processList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.processTypeId,
+        label: node.processTypeName,
+        children: node.children,
+      };
+    },
+    /** 查询设备类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then((response) => {
+        this.machineryTypeOptions = [];
+        const data = this.handleTree(
+          response.data,
+          "processTypeId",
+          "parentTypeId"
+        )[0];
+        this.machineryTypeOptions.push(data);
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.processTypeName.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.processTypeId = data.processTypeId;
+      // this.queryParamsdata = data;
+      this.handleQuery();
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -270,15 +453,17 @@ export default {
         processId: null,
         processCode: null,
         processName: null,
-        attention: null,        
-        enableFlag: 'Y',
+        attention: null,
+        enableFlag: "Y",
         remark: null,
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        processTypeName: null,
+        processTypeId: null,
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -293,9 +478,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.processId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.processId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -303,12 +488,15 @@ export default {
       this.open = true;
       this.title = "添加生产工序";
       this.optType = "add";
+      genCode("PROCESS_CODE").then((response) => {
+        this.form.processCode = response;
+      });
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
       const processId = row.processId || this.ids;
-      getProcess(processId).then(response => {
+      getProcess(processId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "查看工序信息";
@@ -318,8 +506,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const processId = row.processId || this.ids
-      getProcess(processId).then(response => {
+      const processId = row.processId || this.ids;
+      getProcess(processId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改生产工序";
@@ -328,16 +516,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.processId != null) {
-            updateProcess(this.form).then(response => {
+            updateProcess(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addProcess(this.form).then(response => {
+            addProcess(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -349,29 +537,37 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const processIds = row.processId || this.ids;
-      this.$modal.confirm('是否确认删除生产工序？').then(function() {
-        return delProcess(processIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除生产工序？")
+        .then(function () {
+          return delProcess(processIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/pro/process/export', {
-        ...this.queryParams
-      }, `process_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/pro/process/export",
+        {
+          ...this.queryParams,
+        },
+        `process_${new Date().getTime()}.xlsx`
+      );
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('PROCESS_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("PROCESS_CODE").then((response) => {
           this.form.processCode = response;
         });
-      }else{
+      } else {
         this.form.processCode = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/pro/processType/index.vue b/src/views/mes/pro/processType/index.vue
new file mode 100644
index 0000000..9015c90
--- /dev/null
+++ b/src/views/mes/pro/processType/index.vue
@@ -0,0 +1,288 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型名称" prop="processTypeName">
+        <el-input
+          v-model="queryParams.processTypeName"
+          placeholder="请输入工序类型名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select v-model="queryParams.enableFlag" placeholder="选择是或否" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="machinerytypeList"
+      row-key="processTypeId"
+      default-expand-all
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="工序类型编码" prop="processTypeCode" />
+      <el-table-column label="工序类型名称" align="center" prop="processTypeName" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+          >新增</el-button>
+          <el-button
+            v-if="scope.row.parentTypeId != 0"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改工序类型对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24" v-if="form.parentTypeId !== 0">
+            <el-form-item label="父类型" prop="parentTypeId">
+              <treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工序类型名称" prop="processTypeName">
+              <el-input v-model="form.processTypeName" placeholder="请输入工序类型名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enableFlag">
+              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.enableFlag" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMachinerytype, getMachinerytype, delMachinerytype, addMachinerytype, updateMachinerytype } from "@/api/mes/pro/processType";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Machinerytype",
+  dicts: ['sys_yes_no'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      optType:undefined,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 工序类型表格数据
+      machinerytypeList: [],
+      // 工序类型树选项
+      machinerytypeOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        machineryTypeCode: null,
+        processTypeName: null,
+        parentTypeId: null,
+        ancestors: null,
+        enableFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        parentTypeId: [
+          { required: true, message: "父类型不能为空", trigger: "blur" }
+        ],
+        processTypeName: [
+          { required: true, message: "工序类型名称不能为空", trigger: "blur" }
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询工序类型列表 */
+    getList() {
+      this.loading = true;
+      listMachinerytype(this.queryParams).then(response => {
+        this.machinerytypeList = this.handleTree(response.data, "processTypeId", "parentTypeId");
+        this.loading = false;
+      });
+    },
+    /** 转换工序类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.processTypeId,
+        label: node.processTypeName,
+        children: node.children
+      };
+    },
+	/** 查询工序类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then(response => {
+        this.machinerytypeOptions = [];
+        const data = this.handleTree(response.data, "processTypeId", "parentTypeId")[0];
+        this.machinerytypeOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        processTypeId: null,
+        processTypeName: null,
+        parentTypeId: 1,
+        ancestors: null,
+        enableFlag: 'Y',
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.processTypeId) {
+        this.form.parentTypeId = row.processTypeId;
+      } else {
+        this.form.parentTypeId = 0;
+      }
+      this.open = true;
+      this.title = "添加工序类型";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      console.log(row);
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentTypeId = row.processTypeId;
+      }
+      getMachinerytype(row.processTypeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改工序类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.processTypeId != null) {
+            updateMachinerytype(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMachinerytype(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      console.log(row);
+      this.$modal.confirm('是否确认删除工序类型编号为"' + row.processTypeId + '"的数据项？').then(function() {
+        return delMachinerytype(row.processTypeId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/mes/pro/production/components/complete.vue b/src/views/mes/pro/production/components/complete.vue
new file mode 100644
index 0000000..ea11ccc
--- /dev/null
+++ b/src/views/mes/pro/production/components/complete.vue
@@ -0,0 +1,288 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="completeData" style="width: 100%; height: 360px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("completeData"));
+
+      var option = {
+        tooltip: {
+          //提示框组件
+          trigger: "axis",
+          formatter: "{b}<br />{a0}: {c0}<br />{a1}: {c1}",
+          axisPointer: {
+            type: "shadow",
+            label: {
+              backgroundColor: "#6a7985",
+            },
+          },
+          textStyle: {
+            color: "#fff",
+            fontStyle: "normal",
+            fontFamily: "微软雅黑",
+            fontSize: 12,
+          },
+        },
+        grid: {
+          left: "5%",
+          right: "4%",
+          bottom: "6%",
+          top: 60,
+          padding: "0 0 10 0",
+          containLabel: true,
+        },
+        legend: {
+          //图例组件，颜色和名字
+          right: 10,
+          top: 20,
+          itemGap: 16,
+          itemWidth: 18,
+          itemHeight: 10,
+          data: [
+            {
+              name: "实际完成工单数",
+              //icon:'image://../wwwroot/js/url2.png', //路径
+            },
+            {
+              name: "计划工单数",
+            },
+          ],
+          textStyle: {
+            color: "#a8aab0",
+            fontStyle: "normal",
+            fontFamily: "微软雅黑",
+            fontSize: 12,
+          },
+        },
+        xAxis: [
+          {
+            type: "category",
+            boundaryGap: true, //坐标轴两边留白
+            data: [
+              // "2023-07",
+              // "2023-08",
+              // "2023-09",
+              // "2023-10",
+              // "2023-11",
+              // "2023-12",
+              // "2024-01",
+              // "2024-02",
+              // "2024-03",
+              // "2024-04",
+            ],
+            axisLabel: {
+              //坐标轴刻度标签的相关设置。
+              interval: 0, //设置为 1，表示『隔一个标签显示一个标签』
+              margin: 15,
+              textStyle: {
+                color: "#078ceb",
+                fontStyle: "normal",
+                fontFamily: "微软雅黑",
+                fontSize: 12,
+              },
+            },
+            axisTick: {
+              //坐标轴刻度相关设置。
+              show: false,
+            },
+            axisLine: {
+              //坐标轴轴线相关设置
+              lineStyle: {
+                color: "#fff",
+                opacity: 0.2,
+              },
+            },
+            splitLine: {
+              //坐标轴在 grid 区域中的分隔线。
+              show: false,
+            },
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            splitNumber: 5,
+            axisLabel: {
+              textStyle: {
+                color: "#a8aab0",
+                fontStyle: "normal",
+                fontFamily: "微软雅黑",
+                fontSize: 12,
+              },
+            },
+            axisLine: {
+              show: false,
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: ["#fff"],
+                opacity: 0.06,
+              },
+            },
+          },
+        ],
+        series: [
+          {
+            name: "实际完成工单数",
+            type: "bar",
+            // data: [4.9, 7.3, 9.2, 5.6, 7.7, 5.6, 4.2, 3.6, 6, 6.4],
+            barWidth: 10,
+            barGap: 0, //柱间距离
+            label: {
+              //图形上的文本标签
+              normal: {
+                show: true,
+                position: "top",
+                textStyle: {
+                  color: "#a8aab0",
+                  fontStyle: "normal",
+                  fontFamily: "微软雅黑",
+                  fontSize: 12,
+                },
+              },
+            },
+            itemStyle: {
+              //图形样式
+              normal: {
+                barBorderRadius: [5, 5, 0, 0],
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  0,
+                  0,
+                  1,
+                  [
+                    {
+                      offset: 1,
+                      color: "rgba(127, 128, 225, 0.7)",
+                    },
+                    {
+                      offset: 0.9,
+                      color: "rgba(72, 73, 181, 0.7)",
+                    },
+                    {
+                      offset: 0.31,
+                      color: "rgba(0, 208, 208, 0.7)",
+                    },
+                    {
+                      offset: 0.15,
+                      color: "rgba(0, 208, 208, 0.7)",
+                    },
+                    {
+                      offset: 0,
+                      color: "rgba(104, 253, 255, 0.7)",
+                    },
+                  ],
+                  false
+                ),
+              },
+            },
+          },
+          {
+            name: "计划工单数",
+            type: "bar",
+            // data: [2.9, 5, 4.4, 2.7, 5.7, 4.6, 1.2, 2.7, 4.8, 6.0],
+            barWidth: 10,
+            barGap: 0.2, //柱间距离
+            label: {
+              //图形上的文本标签
+              normal: {
+                show: true,
+                position: "top",
+                textStyle: {
+                  color: "#a8aab0",
+                  fontStyle: "normal",
+                  fontFamily: "微软雅黑",
+                  fontSize: 12,
+                },
+              },
+            },
+            itemStyle: {
+              //图形样式
+              normal: {
+                barBorderRadius: [5, 5, 0, 0],
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  0,
+                  0,
+                  1,
+                  [
+                    {
+                      offset: 1,
+                      color: "rgba(127, 128, 225, 0.7)",
+                    },
+                    {
+                      offset: 0.9,
+                      color: "rgba(72, 73, 181, 0.7)",
+                    },
+                    {
+                      offset: 0.25,
+                      color: "rgba(226, 99, 74, 0.7)",
+                    },
+                    {
+                      offset: 0,
+                      color: "rgba(253, 200, 106, 0.7)",
+                    },
+                  ],
+                  false
+                ),
+              },
+            },
+          },
+        ],
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/pro/production/components/defective.vue b/src/views/mes/pro/production/components/defective.vue
new file mode 100644
index 0000000..6eb5fe1
--- /dev/null
+++ b/src/views/mes/pro/production/components/defective.vue
@@ -0,0 +1,190 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="defectiveData" style="width: 100%; height: 310px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("defectiveData"));
+
+      var scale = 1;
+      var echartData = [
+        // {
+        //   value: 5,
+        //   name: "材料不良",
+        // },
+        // {
+        //   value: 1,
+        //   name: "工序不良",
+        // },
+        // {
+        //   value: 2,
+        //   name: "尺寸不良",
+        // },
+        // {
+        //   value: 1,
+        //   name: "其他不良",
+        // },
+      ];
+      var rich = {
+        yellow: {
+          color: "#fff",
+          fontSize: 14 * scale,
+          padding: [5, 4],
+          align: "center",
+        },
+        total: {
+          color: "#49dff0",
+          fontSize: 24 * scale,
+          align: "center",
+        },
+        white: {
+          color: "#fff",
+          align: "center",
+          fontSize: 14 * scale,
+          padding: [5, 0],
+        },
+        blue: {
+          color: "#49dff0",
+          fontSize: 12 * scale,
+          align: "center",
+        },
+        hr: {
+          borderColor: "#0b5263",
+          width: "100%",
+          borderWidth: 1,
+          height: 0,
+        },
+      };
+      var option = {
+        title: {
+          text: "不良品总数",
+          left: "center",
+          top: "53%",
+          padding: [20, 0],
+          textStyle: {
+            color: "#fff",
+            fontSize: 16 * scale,
+            align: "center",
+          },
+        },
+        legend: {
+          selectedMode: false,
+          formatter: function (name) {
+            var total = 0; //各科正确率总和
+            var averagePercent; //综合正确率
+            echartData.forEach(function (value, index, array) {
+              total += value.value;
+            });
+            return "{total|" + total + "}";
+          },
+          data: [echartData[0].name],
+          // data: ['高等教育学'],
+          // itemGap: 50,
+          left: "center",
+          top: "center",
+          icon: "none",
+          align: "center",
+          textStyle: {
+            color: "#fff",
+            fontSize: 16 * scale,
+            rich: rich,
+          },
+        },
+        series: [
+          {
+            name: "不良品总数",
+            type: "pie",
+            radius: ["42%", "50%"],
+            hoverAnimation: false,
+            color: [
+              "#c487ee",
+              "#deb140",
+              "#49dff0",
+              "#034079",
+              "#6f81da",
+              "#00ffb4",
+            ],
+            label: {
+              normal: {
+                formatter: function (params, ticket, callback) {
+                  var total = 0; //考生总数量
+                  var percent = 0; //考生占比
+                  echartData.forEach(function (value, index, array) {
+                    total += value.value;
+                  });
+                  percent = ((params.value / total) * 100).toFixed(1);
+                  return (
+                    "{white|" +
+                    params.value +
+                    "}\n{hr|}\n{yellow|" +
+                    params.name +
+                    "}\n"
+                  );
+                },
+                rich: rich,
+              },
+            },
+            labelLine: {
+              normal: {
+                length: 55 * scale,
+                length2: 0,
+                lineStyle: {
+                  color: "#0b5263",
+                },
+              },
+            },
+            data: echartData,
+          },
+        ],
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/pro/production/components/ticket.vue b/src/views/mes/pro/production/components/ticket.vue
new file mode 100644
index 0000000..195e186
--- /dev/null
+++ b/src/views/mes/pro/production/components/ticket.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="app-container">
+    <!-- 为 ECharts 准备一个定义了宽高的 DOM -->
+    <div id="ticketData" style="width: 100%; height: 360px"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { echarts, Treeselect },
+  props: ["message"], // 声明一个自定义的属性
+  data() {
+    return {
+      echartData: [],
+    };
+  },
+  watch: {
+    message: {
+      immediate: true,
+      handler(val) {
+        //  console.log(val,'差点撒旦阿萨=============');
+        this.echartData = val;
+        //  val.forEach((item) => {
+        //   this.getDataNum.push(Number(item.ytdUvNew))
+        //   this.getDataTime.push(moment(item.dt).format('YYYY-MM-DD'))
+        // })
+        this.$nextTick(() => {
+          //这里需要重新加载渲染
+          this.drawLine();
+        });
+      },
+    },
+  },
+
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = echarts.init(document.getElementById("ticketData"));
+
+      var option = {
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // Use axis to trigger tooltip
+            type: "shadow", // 'shadow' as default; can also be 'line' or 'shadow'
+          },
+        },
+        legend: {
+          // data: ["已完成", "进行中"],
+          top: "5%",
+          right: "5%",
+          icon: "rect",
+          textStyle: {
+            color: "#fff",
+          },
+        },
+        grid: {
+          top: "20%",
+          left: "5%",
+          right: "5%",
+          bottom: "10%",
+          containLabel: true,
+        },
+        xAxis: {
+          type: "value",
+          axisLine: {
+            lineStyle: {
+              color: "rgba(255,255,255,0.8)",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "rgba(255,255,255,0.3)", // 分割线颜色
+            },
+          },
+        },
+        yAxis: {
+          type: "category",
+          //   data: ["已签收", "配送中", "已出库", "采购中", "接单中"],
+          axisLabel: {
+            color: "rgba(255,255,255,0.8)",
+          },
+        },
+        series: [
+          {
+            name: "计划数量",
+            type: "bar",
+            stack: "total",
+            label: {
+              show: true,
+            },
+            emphasis: {
+              focus: "series",
+            },
+            // data: [121, 828, 144, 368, 390],
+            barWidth: 12,
+            itemStyle: {
+              label: {
+                show: true,
+              },
+              labelLine: {
+                show: false,
+              },
+              color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                { offset: 0, color: "rgba(7,165,255,0.2)" },
+                { offset: 1, color: "rgba(7,165,255,1)" },
+              ]),
+              borderColor: "rgba(7,165,255,0.7)",
+              shadowBlur: 16,
+              shadowColor: "rgba(7,165,255,1)",
+            },
+          },
+          {
+            name: "产出数量",
+            type: "bar",
+            stack: "total",
+            label: {
+              show: true,
+            },
+            emphasis: {
+              focus: "series",
+            },
+            // data: [271, 132, 413, 210, 521],
+            barWidth: 12,
+            itemStyle: {
+              label: {
+                show: true,
+              },
+              labelLine: {
+                show: false,
+              },
+              color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                { offset: 0, color: "rgba(41,244,236,0)" },
+                { offset: 1, color: "rgba(41,244,236,1)" },
+              ]),
+              borderColor: "#a2f9f7",
+              shadowBlur: 16,
+              shadowColor: "#a2f9f7",
+            },
+          },
+        ],
+        dataset: {
+          source: [
+            // { status: "今飞智造2.1订单", value1: 33, value2: 93 },
+            // { status: "今飞餐达1.15订单", value1: 53, value2: 32 },
+            // { status: "今飞智造1.1订单", value1: 78, value2: 65 },
+            // { status: "今飞智适12.15打单", value1: 12, value2: 35 },
+            // { status: "今飞智适12.1订单", value1: 90, value2: 52 },
+          ],
+        },
+      };
+
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px !important;
+  min-height: calc(0vh - 0px) !important;
+}
+</style>
diff --git a/src/views/mes/pro/production/components/video.vue b/src/views/mes/pro/production/components/video.vue
new file mode 100644
index 0000000..360dfa2
--- /dev/null
+++ b/src/views/mes/pro/production/components/video.vue
@@ -0,0 +1,115 @@
+<template>
+  <div style="overflow-y: scroll; overflow-x: hidden; height: 100%">
+    <section
+      style="display: flex; justify-content: space-around; flex-wrap: wrap"
+    >
+      <span
+        class="video_warp_item"
+        v-for="(item, index) in liveAddress"
+        v-if="index < 3"
+        :key="index"
+      >
+        <div :id="'video-player-' + index"></div>
+      </span>
+    </section>
+  </div>
+</template>
+
+<script>
+import $ from "jquery"; //  npm i jquery
+import EZUIKit from "ezuikit-js";
+
+export default {
+  name: "dashboard",
+  data() {
+    return {
+      accessToken: "",
+      liveAddress: [],
+      diveType: "",
+      players: [],
+    };
+  },
+
+  created() {
+    this.getbagndianID();
+  },
+  methods: {
+    // 获取磅点摄像头ID列表
+    getbagndianID() {
+      const This = this;
+      // 获取萤石云的accessToken
+      $.ajax({
+        url: "https://open.ys7.com/api/lapp/token/get",
+        type: "POST",
+        dataType: "json",
+        data: {
+          appKey: "4aea64fb66cd46e8ae2ded25e6dbf5bf", //String	appKey	Y
+          appSecret: "9011246f97d2d65ce33ab7c23e7a72de", //	String	appSecret	Y
+        },
+        cache: false,
+        success: function (response) {
+          This.accessToken = response.data.accessToken;
+          $.ajax({
+            url: "https://open.ys7.com/api/lapp/camera/list",
+            header: {
+              "Content-Type": "application/x-www-form-urlencoded",
+            },
+            type: "POST",
+            dataType: "json",
+            data: {
+              accessToken: This.accessToken, //	String	授权过程获取的access_token	Y
+              pageStart: 0,
+              pageSize: 10,
+            },
+            cache: false,
+            success: function (response) {
+              var arr = [];
+              response.data.forEach((item, index) => {
+                if (item.channelNo == 3 || item.channelNo == 4) {
+                } else {
+                  arr.push(item);
+                }
+              });
+
+              console.log(arr);
+              arr.forEach((item, index) => {
+                $.ajax({
+                  url: "https://open.ys7.com/api/lapp/v2/live/address/get",
+                  type: "POST",
+                  dataType: "json",
+                  data: {
+                    accessToken: This.accessToken, //	String	授权过程获取的access_token	Y
+                    deviceSerial: item.deviceSerial,
+                    channelNo: item.channelNo,
+                  },
+                  cache: false,
+                  success: (response) => {
+                    let player = new EZUIKit.EZUIKitPlayer({
+                      id: "video-player-" + index, // 视频容器ID
+                      accessToken: This.accessToken,
+                      url: response.data.url,
+                      template: "voice", // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版; theme-可配置主题；
+                      audio: 0, // 是否默认开启声音 0 - 关闭 1 - 开启
+                      autoplay: false,
+                      width: 190,
+                      height: 150,
+                    });
+                    This.liveAddress.push(player);
+                    console.log(This.liveAddress);
+                  },
+                });
+              });
+            },
+          });
+        },
+      });
+    },
+  },
+  //销毁视频
+  destroyed() {
+    for (var j = 0; j < this.players.length; j++) {
+      this.liveAddress[j].stop();
+    }
+  },
+};
+</script>
diff --git a/src/views/mes/pro/production/components/webrtcstreamer.js b/src/views/mes/pro/production/components/webrtcstreamer.js
new file mode 100644
index 0000000..361ab71
--- /dev/null
+++ b/src/views/mes/pro/production/components/webrtcstreamer.js
@@ -0,0 +1,306 @@
+var WebRtcStreamer = (function() {
+
+    /** 
+     * Interface with WebRTC-streamer API
+     * @constructor
+     * @param {string} videoElement - id of the video element tag
+     * @param {string} srvurl -  url of webrtc-streamer (default is current location)
+    */
+    var WebRtcStreamer = function WebRtcStreamer (videoElement, srvurl) {
+        if (typeof videoElement === "string") {
+            this.videoElement = document.getElementById(videoElement);
+        } else {
+            this.videoElement = videoElement;
+        }
+        this.srvurl           = srvurl || location.protocol+"//"+window.location.hostname+":"+window.location.port;
+        this.pc               = null;    
+    
+        this.mediaConstraints = { offerToReceiveAudio: true, offerToReceiveVideo: true };
+    
+        this.iceServers = null;
+        this.earlyCandidates = [];
+    }
+    
+    WebRtcStreamer.prototype._handleHttpErrors = function (response) {
+        if (!response.ok) {
+            throw Error(response.statusText);
+        }
+        return response;
+    }
+    
+    /** 
+     * Connect a WebRTC Stream to videoElement 
+     * @param {string} videourl - id of WebRTC video stream
+     * @param {string} audiourl - id of WebRTC audio stream
+     * @param {string} options -  options of WebRTC call
+     * @param {string} stream  -  local stream to send
+    */
+    WebRtcStreamer.prototype.connect = function(videourl, audiourl, options, localstream) {
+        this.disconnect();
+        
+        // getIceServers is not already received
+        if (!this.iceServers) {
+            console.log("Get IceServers");
+            
+            fetch(this.srvurl + "/api/getIceServers")
+                .then(this._handleHttpErrors)
+                .then( (response) => (response.json()) )
+                .then( (response) =>  this.onReceiveGetIceServers(response, videourl, audiourl, options, localstream))
+                .catch( (error) => this.onError("getIceServers " + error ))
+                    
+        } else {
+            this.onReceiveGetIceServers(this.iceServers, videourl, audiourl, options, localstream);
+        }
+    }
+    
+    /** 
+     * Disconnect a WebRTC Stream and clear videoElement source
+    */
+    WebRtcStreamer.prototype.disconnect = function() {		
+        if (this.videoElement?.srcObject) {
+            this.videoElement.srcObject.getTracks().forEach(track => {
+                track.stop()
+                this.videoElement.srcObject.removeTrack(track);
+            });
+        }
+        if (this.pc) {
+            fetch(this.srvurl + "/api/hangup?peerid=" + this.pc.peerid)
+                .then(this._handleHttpErrors)
+                .catch( (error) => this.onError("hangup " + error ))
+    
+            
+            try {
+                this.pc.close();
+            }
+            catch (e) {
+                console.log ("Failure close peer connection:" + e);
+            }
+            this.pc = null;
+        }
+    }    
+    
+    /*
+    * GetIceServers callback
+    */
+    WebRtcStreamer.prototype.onReceiveGetIceServers = function(iceServers, videourl, audiourl, options, stream) {
+        this.iceServers       = iceServers;
+        this.pcConfig         = iceServers || {"iceServers": [] };
+        try {            
+            this.createPeerConnection();
+    
+            var callurl = this.srvurl + "/api/call?peerid=" + this.pc.peerid + "&url=" + encodeURIComponent(videourl);
+            if (audiourl) {
+                callurl += "&audiourl="+encodeURIComponent(audiourl);
+            }
+            if (options) {
+                callurl += "&options="+encodeURIComponent(options);
+            }
+            
+            if (stream) {
+                this.pc.addStream(stream);
+            }
+    
+                    // clear early candidates
+            this.earlyCandidates.length = 0;
+            
+            // create Offer
+            this.pc.createOffer(this.mediaConstraints).then((sessionDescription) => {
+                console.log("Create offer:" + JSON.stringify(sessionDescription));
+                
+                this.pc.setLocalDescription(sessionDescription)
+                    .then(() => {
+                        fetch(callurl, { method: "POST", body: JSON.stringify(sessionDescription) })
+                            .then(this._handleHttpErrors)
+                            .then( (response) => (response.json()) )
+                            .catch( (error) => this.onError("call " + error ))
+                            .then( (response) =>  this.onReceiveCall(response) )
+                            .catch( (error) => this.onError("call " + error ))
+                    
+                    }, (error) => {
+                        console.log ("setLocalDescription error:" + JSON.stringify(error)); 
+                    });
+                
+            }, (error) => { 
+                alert("Create offer error:" + JSON.stringify(error));
+            });
+    
+        } catch (e) {
+            this.disconnect();
+            alert("connect error: " + e);
+        }	    
+    }
+    
+    
+    WebRtcStreamer.prototype.getIceCandidate = function() {
+        fetch(this.srvurl + "/api/getIceCandidate?peerid=" + this.pc.peerid)
+            .then(this._handleHttpErrors)
+            .then( (response) => (response.json()) )
+            .then( (response) =>  this.onReceiveCandidate(response))
+            .catch( (error) => this.onError("getIceCandidate " + error ))
+    }
+                        
+    /*
+    * create RTCPeerConnection 
+    */
+    WebRtcStreamer.prototype.createPeerConnection = function() {
+        console.log("createPeerConnection  config: " + JSON.stringify(this.pcConfig));
+        this.pc = new RTCPeerConnection(this.pcConfig);
+        var pc = this.pc;
+        pc.peerid = Math.random();		
+        
+        pc.onicecandidate = (evt) => this.onIceCandidate(evt);
+        pc.onaddstream    = (evt) => this.onAddStream(evt);
+        pc.oniceconnectionstatechange = (evt) => {  
+            console.log("oniceconnectionstatechange  state: " + pc.iceConnectionState);
+            if (this.videoElement) {
+                if (pc.iceConnectionState === "connected") {
+                    this.videoElement.style.opacity = "1.0";
+                }			
+                else if (pc.iceConnectionState === "disconnected") {
+                    this.videoElement.style.opacity = "0.25";
+                }			
+                else if ( (pc.iceConnectionState === "failed") || (pc.iceConnectionState === "closed") )  {
+                    this.videoElement.style.opacity = "0.5";
+                } else if (pc.iceConnectionState === "new") {
+                    this.getIceCandidate();
+                }
+            }
+        }
+        pc.ondatachannel = function(evt) {  
+            console.log("remote datachannel created:"+JSON.stringify(evt));
+            
+            evt.channel.onopen = function () {
+                console.log("remote datachannel open");
+                this.send("remote channel openned");
+            }
+            evt.channel.onmessage = function (event) {
+                console.log("remote datachannel recv:"+JSON.stringify(event.data));
+            }
+        }
+        pc.onicegatheringstatechange = function() {
+            if (pc.iceGatheringState === "complete") {
+                const recvs = pc.getReceivers();
+            
+                recvs.forEach((recv) => {
+                  if (recv.track && recv.track.kind === "video") {
+                    console.log("codecs:" + JSON.stringify(recv.getParameters().codecs))
+                  }
+                });
+              }
+        }
+    
+        try {
+            var dataChannel = pc.createDataChannel("ClientDataChannel");
+            dataChannel.onopen = function() {
+                console.log("local datachannel open");
+                this.send("local channel openned");
+            }
+            dataChannel.onmessage = function(evt) {
+                console.log("local datachannel recv:"+JSON.stringify(evt.data));
+            }
+        } catch (e) {
+            console.log("Cannor create datachannel error: " + e);
+        }	
+        
+        console.log("Created RTCPeerConnnection with config: " + JSON.stringify(this.pcConfig) );
+        return pc;
+    }
+    
+    
+    /*
+    * RTCPeerConnection IceCandidate callback
+    */
+    WebRtcStreamer.prototype.onIceCandidate = function (event) {
+        if (event.candidate) {
+            if (this.pc.currentRemoteDescription)  {
+                this.addIceCandidate(this.pc.peerid, event.candidate);					
+            } else {
+                this.earlyCandidates.push(event.candidate);
+            }
+        } 
+        else {
+            console.log("End of candidates.");
+        }
+    }
+    
+    
+    WebRtcStreamer.prototype.addIceCandidate = function(peerid, candidate) {
+        fetch(this.srvurl + "/api/addIceCandidate?peerid="+peerid, { method: "POST", body: JSON.stringify(candidate) })
+            .then(this._handleHttpErrors)
+            .then( (response) => (response.json()) )
+            .then( (response) =>  {console.log("addIceCandidate ok:" + response)})
+            .catch( (error) => this.onError("addIceCandidate " + error ))
+    }
+                    
+    /*
+    * RTCPeerConnection AddTrack callback
+    */
+    WebRtcStreamer.prototype.onAddStream = function(event) {
+        console.log("Remote track added:" +  JSON.stringify(event));
+        
+        this.videoElement.srcObject = event.stream;
+        var promise = this.videoElement.play();
+        if (promise !== undefined) {
+          promise.catch((error) => {
+            console.warn("error:"+error);
+            this.videoElement.setAttribute("controls", true);
+          });
+        }
+    }
+            
+    /*
+    * AJAX /call callback
+    */
+    WebRtcStreamer.prototype.onReceiveCall = function(dataJson) {
+    
+        console.log("offer: " + JSON.stringify(dataJson));
+        var descr = new RTCSessionDescription(dataJson);
+        this.pc.setRemoteDescription(descr).then(() =>  { 
+                console.log ("setRemoteDescription ok");
+                while (this.earlyCandidates.length) {
+                    var candidate = this.earlyCandidates.shift();
+                    this.addIceCandidate(this.pc.peerid, candidate);				
+                }
+            
+                this.getIceCandidate()
+            }
+            , (error) => { 
+                console.log ("setRemoteDescription error:" + JSON.stringify(error)); 
+            });
+    }	
+    
+    /*
+    * AJAX /getIceCandidate callback
+    */
+    WebRtcStreamer.prototype.onReceiveCandidate = function(dataJson) {
+        console.log("candidate: " + JSON.stringify(dataJson));
+        if (dataJson) {
+            for (var i=0; i<dataJson.length; i++) {
+                var candidate = new RTCIceCandidate(dataJson[i]);
+                
+                console.log("Adding ICE candidate :" + JSON.stringify(candidate) );
+                this.pc.addIceCandidate(candidate).then( () =>      { console.log ("addIceCandidate OK"); }
+                    , (error) => { console.log ("addIceCandidate error:" + JSON.stringify(error)); } );
+            }
+            this.pc.addIceCandidate();
+        }
+    }
+    
+    
+    /*
+    * AJAX callback for Error
+    */
+    WebRtcStreamer.prototype.onError = function(status) {
+        console.log("onError:" + status);
+    }
+    
+    return WebRtcStreamer;
+    })();
+    
+    if (typeof window !== 'undefined' && typeof window.document !== 'undefined') {
+        window.WebRtcStreamer = WebRtcStreamer;
+    }
+    if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
+        module.exports = WebRtcStreamer;
+    }
+    
\ No newline at end of file
diff --git a/src/views/mes/pro/production/index.vue b/src/views/mes/pro/production/index.vue
new file mode 100644
index 0000000..756ace1
--- /dev/null
+++ b/src/views/mes/pro/production/index.vue
@@ -0,0 +1,573 @@
+<template>
+  <div class="shopping-classify">
+    <div class="right-menu" id="container">
+      <!-- 头 -->
+      <div style="height: 10%">
+        <el-row type="flex" justify="space-between" style="height: 100%">
+          <el-col :span="10">
+            <div
+              class="grid-content bg-purple"
+              style="display: flex; flex-direction: row-reverse"
+            >
+              <!-- <svg-icon
+                :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+                style="
+                  width: 20px;
+                  height: 20px;
+                  color: #f4deb0;
+                  margin: 0% -70% 1% 0%;
+                "
+                @click="buttoncli"
+              /> -->
+              <img
+                @click="buttoncli"
+                style="height: 40px; margin: 5% 4.3% 0% 0%"
+                src="../../../../assets/images/return.png"
+              /></div
+          ></el-col>
+          <el-col
+            :span="5"
+            style="
+              display: flex;
+              flex-direction: column;
+              justify-content: space-evenly;
+              align-items: center;
+            "
+            ><div style="color: #fff; font-size: 30px; font-weight: 700">
+              {{ this.title }}
+            </div>
+            <div
+              style="color: rgb(9 207 255); font-size: 18px; margin-bottom: 4%"
+            >
+              <span>{{ this.dateYear }}</span> {{ this.dateDay }}
+              <span>{{ this.dateWeek }}</span>
+            </div>
+          </el-col>
+          <el-col :span="10"
+            ><div class="grid-content bg-purple" style="display: flex">
+              <img
+                style="height: 40px; margin: 5% 0% 0% 4%"
+                src="../../../../assets/images/biaotixiugai.png"
+                @click="handleChange"
+              />
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <!-- 第一部分 -->
+      <div style="height: 15%">
+        <div>
+          <el-row>
+            <el-col
+              :span="24"
+              style="color: #fff; font-size: 30px; font-weight: 700"
+            >
+              <div
+                style="
+                  display: flex;
+                  justify-content: center;
+                  margin-top: -10px;
+                  margin-bottom: 20px;
+                "
+              >
+                <el-radio-group v-model="radio4" size="mini">
+                  <el-radio-button :label="1">今日</el-radio-button>
+                  <el-radio-button :label="2">昨日</el-radio-button>
+                  <el-radio-button :label="3">本周</el-radio-button>
+                  <el-radio-button :label="4">本月</el-radio-button>
+                </el-radio-group>
+              </div></el-col
+            >
+          </el-row>
+        </div>
+        <div>
+          <el-row
+            :gutter="24"
+            style="color: #fff; font-size: 30px; font-weight: 700"
+          >
+            <el-col :span="4"
+              ><div
+                class="grid-content bg-purple"
+                style="margin: 10% 10% 10% 27%"
+              >
+                0
+              </div></el-col
+            >
+            <el-col :span="4"
+              ><div
+                class="grid-content bg-purple"
+                style="margin: 10% 10% 10% 35%"
+              >
+                0
+              </div></el-col
+            >
+            <el-col :span="4"
+              ><div
+                class="grid-content bg-purple"
+                style="margin: 10% 10% 10% 37%"
+              >
+                0
+              </div></el-col
+            >
+            <el-col :span="4"
+              ><div
+                class="grid-content bg-purple"
+                style="margin: 10% 10% 10% 44%"
+              >
+                0
+              </div></el-col
+            >
+            <el-col :span="4"
+              ><div
+                class="grid-content bg-purple"
+                style="margin: 10% 10% 10% 47%"
+              >
+                0
+              </div></el-col
+            >
+            <el-col :span="4"
+              ><div
+                class="grid-content bg-purple"
+                style="margin: 10% 10% 10% 60%"
+              >
+                0
+              </div></el-col
+            >
+          </el-row>
+        </div>
+      </div>
+
+      <!-- 第二部分 -->
+      <div style="height: 75%">
+        <div style="height: 50%; display: flex">
+          <div style="width: 45%">
+            <ticket :message="this.ticketData" />
+          </div>
+          <div style="width: 24%; margin-top: 50px">
+            <defective :message="this.defectiveData" />
+          </div>
+          <div style="width: 30%; margin-top: 50px">
+            <ezuikit></ezuikit>
+          </div>
+        </div>
+        <div style="height: 50%; display: flex">
+          <div style="width: 45%">
+            <complete :message="this.completeData" />
+          </div>
+          <div style="width: 55%; margin-top: 50px">
+            <el-row :gutter="32" style="padding: 16px 16px 0">
+              <!-- <el-card> -->
+              <el-table
+                :data="workorderList"
+                row-key="workorderId"
+                default-expand-all
+                :tree-props="{
+                  children: 'children',
+                  hasChildren: 'hasChildren',
+                }"
+              >
+                <el-table-column
+                  label="工单号"
+                  width="150"
+                  align="center"
+                  prop="sourceCode"
+                />
+                <el-table-column
+                  label="工单名称"
+                  align="center"
+                  width="150"
+                  prop="clientName"
+                  :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                  label="产品名称"
+                  width="150"
+                  align="center"
+                  prop="productCode"
+                />
+                <el-table-column
+                  label="产出数量"
+                  width="150px"
+                  align="center"
+                  prop="productName"
+                  :show-overflow-tooltip="true"
+                />
+                <el-table-column label="进度" align="center" width="275px">
+                  <template slot-scope="scope">
+                    <el-progress
+                      :text-inside="true"
+                      :stroke-width="20"
+                      :percentage="
+                        parseFloat(
+                          (
+                            (scope.row.quantityProduced / scope.row.quantity) *
+                            100
+                          ).toFixed(2)
+                        )
+                      "
+                    ></el-progress>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="实际开始时间"
+                  align="center"
+                  prop="requestDate"
+                  width="180"
+                >
+                  <template slot-scope="scope">
+                    <span>{{
+                      parseTime(scope.row.requestDate, "{y}-{m}-{d}")
+                    }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <!-- </el-card> -->
+            </el-row>
+          </div>
+        </div>
+      </div>
+
+      <!--标题修改-->
+      <el-dialog :visible.sync="titleVisible" append-to-body width="30%">
+        <el-form ref="installForm" :model="installForm" label-width="80px">
+          <el-form-item label="标题修改">
+            <el-input
+              maxlength="11"
+              show-word-limit
+              v-model="installForm.name"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="titleVisible = false">取消</el-button>
+          <el-button type="primary" @click="sumitInstall">确认</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import dayjs from "dayjs";
+import axios from "axios";
+import { listWorkorder } from "@/api/mes/pro/workorder";
+
+// import * as statisServer from "@/api/statistics";
+// import { getInfo } from "@/api/user";
+import screenfull from "screenfull";
+import defective from "./components/defective.vue";
+import complete from "./components/complete.vue";
+import ticket from "./components/ticket.vue";
+import ezuikit from "./components/video.vue";
+
+export default {
+  components: { defective, complete, ticket, ezuikit, dayjs },
+  data() {
+    return {
+      dateDay: null,
+      dateYear: null,
+      dateWeek: null,
+      weekday: [
+        "星期日",
+        "星期一",
+        "星期二",
+        "星期三",
+        "星期四",
+        "星期五",
+        "星期六",
+      ],
+      timer: null,
+
+      rtSp1: "",
+      screenfull: false,
+      title: "生产监控分析",
+      titleVisible: false,
+      installForm: { name: "" },
+      taskForm: {
+        total_num: 0, // 采样任务百分比 （完成/总数量）
+        completed_num: 0,
+        incompleted_num: 0,
+      },
+      lineChartData: {},
+      totalarr: 0, // 求和
+      month: "", //获取当月合同
+      Contracts: "",
+      barquantity: [],
+      completeData: [],
+      ticketData: [],
+      defectiveData: [],
+      workorderList: [],
+      signarr: [],
+      detection: [],
+      reports: "",
+      issue: "1",
+      accumulation: true,
+      thisYear: false,
+      isFullscreen: false,
+      radio4: 1,
+      monitorPoints: [],
+    };
+  },
+
+  created() {
+    this.timer = setInterval(() => {
+      const date = dayjs(new Date());
+      this.dateDay = date.format("HH:mm:ss");
+      this.dateYear = date.format("YYYY-MM-DD");
+      this.dateWeek = date.format(this.weekday[date.day()]);
+    }, 1000);
+
+    // 监听事件
+    window.addEventListener("resize", this.onresize);
+    this.getList();
+    this.findTasks();
+    this.findContactList();
+    this.findSampleClass();
+    this.findvalid();
+    this.findSortContNumList();
+    this.NumberReports();
+    this.factorNumber();
+  },
+
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+    // 取消监听事件
+    window.removeEventListener("resize", this.onresize);
+  },
+  methods: {
+    // 监听是否全屏状态
+    onresize(event) {
+      // 利用屏幕分辨率和window对象的内高度来判断兼容IE
+      let winFlag = window.innerHeight === window.screen.height;
+      // 利用window全屏标识来判断 -- IE无效
+      let isFull = window.fullScreen || document.webkitIsFullScreen;
+
+      if (isFull === undefined) {
+        this.isFullscreen = winFlag;
+      } else {
+        this.isFullscreen = winFlag || isFull;
+      }
+      // console.log(winFlag); // true全屏   false不是全屏
+    },
+    buttoncli() {
+      const element = document.getElementById("container");
+      if (!screenfull) {
+        this.$message({
+          message: "浏览器不能全屏，安装其他版本试试",
+          type: "warning",
+        });
+        return false;
+      }
+      screenfull.toggle(element);
+      this.findSampleClass();
+      this.findSortContNumList();
+      this.factorNumber();
+    },
+
+    buttoncliArr() {
+      const element = document.getElementById("container");
+      if (!screenfull) {
+        this.$message({
+          message: "浏览器不能全屏，安装其他版本试试",
+          type: "warning",
+        });
+        return false;
+      }
+      screenfull.toggle(element);
+    },
+
+    getList() {
+      // listWorkorder(this.queryParams).then((response) => {
+      //   this.workorderList = response.data;
+      // });
+    },
+
+    // 任务
+    findTasks() {
+      //   statisServer.findCompleteTask({ type: 1 }).then(res => {
+      //     if (res.code === 200) {
+      //       const taskForm = res.result.find(i => i.name === "报告编制任务");
+      //       this.taskForm.total_num = taskForm.totalCnt;
+      //       this.taskForm.completed_num = Number(
+      //         taskForm.totalCnt - taskForm.completeCnt
+      //       ).toFixed(0);
+      //       this.taskForm.incompleted_num = taskForm.completeCnt;
+      //     }
+      //   });
+    },
+    //合同总数
+    findContactList() {
+      //   statisServer.findValidContractsForPass11Month().then(res => {
+      //     if (res.code === 200) {
+      //       this.lineChartData = res.result || [];
+      //       // 求和
+      //       this.lineChartData.contactNum.forEach(item => {
+      //         this.totalarr += item;
+      //       });
+      //       //获取当月合同
+      //       this.month = this.lineChartData.contactNum.pop();
+      //     }
+      //   });
+    },
+
+    //样品类别
+    findSampleClass() {
+      //   statisServer.findStoredSampleClassificationCnt({ limit: 6 }).then(res => {
+      //     if (res.code === 200) {
+      //       var arr = [];
+      //       var barData = res.result.xNameData;
+      //       var barquantity = res.result.xValData;
+      //       //
+      //       barData.forEach((item, i) => {
+      //         arr.push({
+      //           name: item,
+      //           value: barquantity[i]
+      //         });
+      //       });
+      //       this.barquantity = arr;
+      //     }
+      //   });
+    },
+
+    findvalid() {
+      //   statisServer.findValidContracts({ type: 0 }).then(res => {
+      //     if (res.code === 200) {
+      //       this.Contracts = res.result.cusSum;
+      //     }
+      //   });
+    },
+    //签合同排名
+    findSortContNumList() {
+      //   statisServer.findSortContNum({ type: 1, limit: 5 }).then(res => {
+      //     if (res.code === 200) {
+      //       var arr = [];
+      //       var barData = res.result.xNameData;
+      //       var barquantity = res.result.xValData;
+      //       //
+      //       barData.forEach((item, i) => {
+      //         arr.push({
+      //           code: item,
+      //           fundPost: barquantity[i]
+      //         });
+      //       });
+      //       arr.sort((a, b) => {
+      //         return b.fundPost - a.fundPost;
+      //       }); //升序
+      //       this.signarr = arr.slice(0, 10);
+      //     }
+      //   });
+    },
+    //签发报告数
+    NumberReports() {
+      //   statisServer.getReport({ type: this.issue }).then(res => {
+      //     if (res.code === 200) {
+      //       this.reports = res.result;
+      //     }
+      //   });
+    },
+    //因子数
+    factorNumber() {
+      //   statisServer.detectorFactor().then(res => {
+      //     if (res.code === 200) {
+      //       var arr = res.result;
+      //       arr.sort((a, b) => {
+      //         return b.value - a.value;
+      //       }); //升序
+      //       this.detection = arr.slice(0, 10);
+      //     }
+      //   });
+    },
+
+    handleChange() {
+      this.titleVisible = true;
+    },
+    //修改确认
+    sumitInstall() {
+      //   statisServer.updateName(this.installForm).then(res => {
+      //     if (res.code === 200) {
+      //       this.$notify({
+      //         title: "修改成功",
+      //         message: res.message,
+      //         type: "success"
+      //       });
+      //       this.titleVisible = false;
+      //       this.getList();
+      //     }
+      //   });
+    },
+    accumulationClick() {
+      this.issue = 2;
+      this.accumulation = false;
+      this.thisYear = true;
+      this.NumberReports();
+    },
+    thisYearClick() {
+      this.issue = 1;
+      this.accumulation = true;
+      this.thisYear = false;
+      this.NumberReports();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+#container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100vh;
+  background: url("../../../../assets/images/scjk.png") center center no-repeat;
+  background-size: 100% 100%;
+}
+.row-bg-1 {
+  height: 70px;
+  color: #fff;
+  text-align: center;
+}
+.row-bg-3 {
+  height: 100%;
+  text-align: center;
+  color: #fff;
+  font-size: 20px;
+  font-weight: 700;
+}
+.row-bg-4 {
+  color: #8bdbe6;
+  font-size: 25px;
+  margin-top: 27%;
+  font-weight: 500;
+}
+.row-bg-5 {
+  height: 365px;
+  text-align: center;
+  color: #fff;
+  font-size: 20px;
+  font-weight: 700;
+}
+
+::v-deep .el-table {
+  background-color: transparent; /* 背景透明 */
+}
+
+::v-deep .el-table th {
+  color: #979bb4; /* 字体颜色 */
+  font-size: 16px;
+  background-color: transparent; /* 背景透明 */
+  border: 0;
+  height: 30px;
+  line-height: 30px;
+}
+::v-deep .el-table tr,
+.el-table td {
+  color: #e5dada;
+  font-size: 12px;
+  background-color: transparent; /* 背景透明 */
+  border: 0;
+  height: 30px;
+  line-height: 30px;
+}
+/* 上面两个背景色透明才能让table的背景透明少一个都不行 */
+</style>
diff --git a/src/views/mes/pro/proroute/index.vue b/src/views/mes/pro/proroute/index.vue
index bc08c9a..df05d3d 100644
--- a/src/views/mes/pro/proroute/index.vue
+++ b/src/views/mes/pro/proroute/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="工艺路线编号" prop="routeCode">
         <el-input
           v-model="queryParams.routeCode"
@@ -26,8 +33,16 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -40,7 +55,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:pro:proroute:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,7 +67,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:pro:proroute:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +79,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:pro:proroute:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,31 +90,47 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:pro:proroute:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="prorouteList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="prorouteList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工艺路线编号" align="center" prop="routeCode" >
+      <el-table-column label="工艺路线编号" align="center" prop="routeCode">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:pro:proroute:query']"
-          >{{scope.row.routeCode}}</el-button>
+            >{{ scope.row.routeCode }}</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="工艺路线名称" align="center" prop="routeName" />
       <el-table-column label="工艺路线说明" align="center" prop="routeDesc" />
       <el-table-column label="是否启用" align="center" prop="enableFlag">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.enableFlag"
+          />
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -104,20 +138,25 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:proroute:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:pro:proroute:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
+          <el-button size="mini" type="text" @click="handlecopy(scope.row)"
+            >复制</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -125,43 +164,63 @@
     />
 
     <!-- 添加或修改工艺路线对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1080px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1080px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编号" prop="routeCode">
-              <el-input v-model="form.routeCode" placeholder="请输入工艺路线编号" />
+              <el-input
+                v-model="form.routeCode"
+                placeholder="请输入工艺路线编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="名称" prop="routeName">
-              <el-input v-model="form.routeName" placeholder="请输入工艺路线名称" />
+              <el-input
+                v-model="form.routeName"
+                placeholder="请输入工艺路线名称"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="是否启用" prop="enableFlag">
-              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+              <el-radio-group
+                v-model="form.enableFlag"
+                disabled
+                v-if="optType == 'view'"
+              >
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
               <el-radio-group v-model="form.enableFlag" v-else>
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -169,28 +228,46 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="说明" prop="routeDesc">
-              <el-input v-model="form.routeDesc" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.routeDesc"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-tabs type="border-card" v-if="form.routeId != null">        
+      <el-tabs type="border-card" v-if="form.routeId != null">
         <el-tab-pane label="组成工序">
-          <Routeprocess v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprocess>         
+          <Routeprocess
+            v-if="form.routeId != null"
+            :optType="optType"
+            :routeId="form.routeId"
+          ></Routeprocess>
         </el-tab-pane>
         <el-tab-pane label="关联产品">
-          <Routeproduct v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeproduct>
+          <Routeproduct
+            v-if="form.routeId != null"
+            :optType="optType"
+            :routeId="form.routeId"
+          ></Routeproduct>
         </el-tab-pane>
       </el-tabs>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -199,18 +276,25 @@
 </template>
 
 <script>
-import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/mes/pro/proroute";
+import {
+  listProroute,
+  getProroute,
+  delProroute,
+  addProroute,
+  updateProroute,
+  copyProRoute,
+} from "@/api/mes/pro/proroute";
 import Routeprocess from "./routeprocess";
 import Routeproduct from "./product";
-import {genCode} from "@/api/system/autocode/rule"
+import { genCode } from "@/api/system/autocode/rule";
 export default {
   name: "Proroute",
-  dicts: ['sys_yes_no'],
-  components: {Routeprocess,Routeproduct},
+  dicts: ["sys_yes_no"],
+  components: { Routeprocess, Routeproduct },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -244,15 +328,15 @@ export default {
       // 表单校验
       rules: {
         routeCode: [
-          { required: true, message: "工艺路线编号不能为空", trigger: "blur" }
+          { required: true, message: "工艺路线编号不能为空", trigger: "blur" },
         ],
         routeName: [
-          { required: true, message: "工艺路线名称不能为空", trigger: "blur" }
+          { required: true, message: "工艺路线名称不能为空", trigger: "blur" },
         ],
         enableFlag: [
-          { required: true, message: "是否启用不能为空", trigger: "blur" }
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -262,7 +346,7 @@ export default {
     /** 查询工艺路线列表 */
     getList() {
       this.loading = true;
-      listProroute(this.queryParams).then(response => {
+      listProroute(this.queryParams).then((response) => {
         this.prorouteList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -280,14 +364,14 @@ export default {
         routeCode: null,
         routeName: null,
         routeDesc: null,
-        enableFlag: 'Y',
+        enableFlag: "Y",
         remark: null,
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -302,9 +386,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.routeId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.routeId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -312,12 +396,15 @@ export default {
       this.open = true;
       this.title = "添加工艺路线";
       this.optType = "add";
+      genCode("ROUTE_CODE").then((response) => {
+        this.form.routeCode = response;
+      });
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
       const routeId = row.routeId || this.ids;
-      getProroute(routeId).then(response => {
+      getProroute(routeId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "查看工艺线路信息";
@@ -327,8 +414,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const routeId = row.routeId || this.ids
-      getProroute(routeId).then(response => {
+      const routeId = row.routeId || this.ids;
+      getProroute(routeId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改工艺路线";
@@ -337,16 +424,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.routeId != null) {
-            updateProroute(this.form).then(response => {
+            updateProroute(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addProroute(this.form).then(response => {
+            addProroute(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -358,29 +445,52 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const routeIds = row.routeId || this.ids;
-      this.$modal.confirm('是否确认删除工艺路线编号为"' + routeIds + '"的数据项？').then(function() {
-        return delProroute(routeIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除？')
+        .then(function () {
+          return delProroute(routeIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    handlecopy(row) {
+      const routeId = row.routeId || this.ids;
+      copyProRoute(routeId).then((response) => {
+        this.$modal
+          .confirm("是否确认复制？")
+          .then(function () {
+            return delProroute(routeId);
+          })
+          .then(() => {
+            this.getList();
+            this.$modal.msgSuccess("复制成功");
+          })
+          .catch(() => {});
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('pro/proroute/export', {
-        ...this.queryParams
-      }, `proroute_${new Date().getTime()}.xlsx`)
+      this.download(
+        "pro/proroute/export",
+        {
+          ...this.queryParams,
+        },
+        `proroute_${new Date().getTime()}.xlsx`
+      );
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('ROUTE_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("ROUTE_CODE").then((response) => {
           this.form.routeCode = response;
         });
-      }else{
+      } else {
         this.form.routeCode = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue
index 41ecf43..25046df 100644
--- a/src/views/mes/pro/proroute/routeprocess.vue
+++ b/src/views/mes/pro/proroute/routeprocess.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" v-if="optType !='view'" class="mb8">
+    <el-row :gutter="10" v-if="optType != 'view'" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -9,7 +9,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:pro:proroute:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -20,7 +21,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:pro:proroute:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -31,40 +33,99 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:pro:proroute:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="routeprocessList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="routeprocessList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" fixed prop="orderNum" />
-      <el-table-column label="工序编码" width="120px" fixed align="center" prop="processCode" />
-      <el-table-column label="工序名称" width="150px" fixed align="center" prop="processName" />
-      <el-table-column label="下一道工序" width="150px"  align="center" prop="nextProcessName" />
-      <el-table-column label="与下一道工序关系" width="150px" align="center" prop="linkType">
+      <el-table-column
+        label="工序编码"
+        width="120px"
+        fixed
+        align="center"
+        prop="processCode"
+      />
+      <el-table-column
+        label="工序名称"
+        width="150px"
+        fixed
+        align="center"
+        prop="processName"
+      />
+      <el-table-column
+        label="下一道工序"
+        width="150px"
+        align="center"
+        prop="nextProcessName"
+      />
+      <el-table-column
+        label="与下一道工序关系"
+        width="150px"
+        align="center"
+        prop="linkType"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_link_type" :value="scope.row.linkType"/>
+          <dict-tag
+            :options="dict.type.mes_link_type"
+            :value="scope.row.linkType"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="关键工序" width="100px" align="center" prop="keyFlag">
+      <el-table-column
+        label="关键工序"
+        width="100px"
+        align="center"
+        prop="keyFlag"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.keyFlag"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.keyFlag"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="质检确认" width="100px" align="center" prop="isCheck">
+      <el-table-column
+        label="质检确认"
+        width="100px"
+        align="center"
+        prop="isCheck"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isCheck"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.isCheck"
+          />
         </template>
       </el-table-column>
       <el-table-column label="准备时间" align="center" prop="defaultPreTime" />
       <el-table-column label="等待时间" align="center" prop="defaultSufTime" />
-      <el-table-column label="甘特图显示颜色" align="center" prop="colorCode" >
+      <el-table-column label="甘特图显示颜色" align="center" prop="colorCode">
         <template slot-scope="scope">
-            <el-color-picker v-model="scope.row.colorCode" disabled></el-color-picker>
+          <el-color-picker
+            v-model="scope.row.colorCode"
+            disabled
+          ></el-color-picker>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="150px" v-if="optType !='view'" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        fixed="right"
+        width="150px"
+        v-if="optType != 'view'"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -72,20 +133,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:proroute:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:pro:proroute:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -93,119 +156,290 @@
     />
 
     <!-- 添加或修改工艺组成对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1100px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-row>
-            <el-col :span="12">
-                <el-form-item label="序号" prop="orderNum">
-                    <el-input-number :min="1" v-model="form.orderNum" placeholder="请输入序号" />
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-                <el-form-item label="工序" prop="processId">
-                    <el-select v-model="form.processId" placeholder="请选择工序">
-                        <el-option
-                        v-for="item in processOptions"
-                        :key="item.processId"
-                        :label="item.processName"
-                        :value="item.processId"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="12">
-                <el-form-item label="与下一道工序关系" prop="linkType">
-                    <el-tooltip effect="dark" placement="right">
-                    <div slot="content">
-                        S-to-S：当前工序开始生产，下一道工序才可开始生产 </br>
-                        F-to-F：当前工序结束生产，下一道工序才可结束生产 </br>
-                        S-to-F：当前工序开始生产，下一道工序才可结束生产 </br>
-                        F-to-S：当前工序结束生产，下一道工序才可开始生产
-                    </div>
-                    <el-select v-model="form.linkType" placeholder="请选择与下一道工序关系">
-                        <el-option
-                        v-for="dict in dict.type.mes_link_type"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                        ></el-option>
-                    </el-select>
-                    </el-tooltip>
-                </el-form-item>
-            </el-col>
-            <el-col :span="5">
-                <el-form-item label="甘特图显示颜色" prop="colorCode">
-                    <el-color-picker v-model="form.colorCode"></el-color-picker>                        
-                </el-form-item>
-            </el-col>
-            <el-col :span="7">
-                    <el-input v-model="form.colorCode" maxlength="7" placeholder="请输入颜色编码在左侧选择颜色" />                
-            </el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="8">
-              <el-form-item label="是否关键工序" prop="keyFlag">
-                    <el-tooltip effect="dark" placement="right">
-                    <div slot="content">
-                        是：整个工单的生产进度将根据当前工序的生产报工数量进行更新</br>
-                        每个工艺流程只能有一个关键工序                        
-                    </div>
-                    <el-select v-model="form.keyFlag">
-                        <el-option
-                        v-for="dict in dict.type.sys_yes_no"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                        ></el-option>
-                    </el-select>
-                    </el-tooltip>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="是否需要质检确认" prop="isCheck">
-                    <el-tooltip effect="dark" placement="right">
-                    <div slot="content">
-                        是：当前工序报工时需要进行质检确认</br>
-                        质检合格数量作为最终生产数量                                            
-                    </div>
-                    <el-select v-model="form.isCheck">
-                        <el-option
-                        v-for="dict in dict.type.sys_yes_no"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                        ></el-option>
-                    </el-select>
-                    </el-tooltip>
-                </el-form-item>
-            </el-col>
-        </el-row>
         <el-row>
           <el-col :span="8">
-                <el-form-item label="准备时间" prop="defaultPreTime">
-                    <el-tooltip effect="dark" content="当前系统支持的最小时间粒度为1小时" placement="right">
-                        <el-input-number :min="0" :step="1" v-model="form.defaultPreTime" placeholder="请输入准备时间" />
-                    </el-tooltip>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8">
-                <el-form-item label="等待时间" prop="defaultSufTime">
-                    <el-input-number :min="0" :step="1" v-model="form.defaultSufTime" placeholder="请输入等待时间" />
-                </el-form-item>
-            </el-col>
+            <el-form-item label="序号" prop="orderNum">
+              <el-input-number
+                :min="0"
+                v-model="form.orderNum"
+                placeholder="请输入序号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工序类型" prop="processTypeId">
+              <treeselect
+                v-model="form.processTypeId"
+                :options="machineryTypeOptions1"
+                :normalizer="normalizer1"
+                placeholder="请选择工序类型"
+                @select="handleNodeProcess"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工序" prop="processId">
+              <el-select v-model="form.processId" placeholder="请选择工序">
+                <el-option
+                  v-for="item in processOptions"
+                  :key="item.processId"
+                  :label="item.processName"
+                  :value="item.processId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-            <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
-                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                </el-form-item>
-            </el-col>
+          <el-col :span="12">
+            <el-form-item label="与下一道工序关系" prop="linkType">
+              <el-tooltip effect="dark" placement="right">
+                <div slot="content">
+                  <div>F-to-S：当前工序结束生产，下一道工序才可开始生产</div>
+                  <div>S-to-F：当前工序开始生产，下一道工序才可结束生产</div>
+                  <div>F-to-F：当前工序结束生产，下一道工序才可结束生产</div>
+                  <div>S-to-S：当前工序开始生产，下一道工序才可开始生产</div>
+                </div>
+                <el-select
+                  v-model="form.linkType"
+                  placeholder="请选择与下一道工序关系"
+                >
+                  <el-option
+                    v-for="dict in dict.type.mes_link_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="甘特图显示颜色" prop="colorCode">
+              <el-color-picker v-model="form.colorCode"></el-color-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-input
+              v-model="form.colorCode"
+              maxlength="7"
+              placeholder="请输入颜色编码在左侧选择颜色"
+            />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否关键工序" prop="keyFlag">
+              <el-tooltip effect="dark" placement="right">
+                <div slot="content">
+                  <div>
+                    是：整个工单的生产进度将根据当前工序的生产报工数量进行更新
+                  </div>
+                  <div>每个工艺流程只能有一个关键工序</div>
+                </div>
+                <el-select v-model="form.keyFlag">
+                  <el-option
+                    v-for="dict in dict.type.sys_yes_no"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否需要质检确认" prop="isCheck">
+              <el-tooltip effect="dark" placement="right">
+                <div slot="content">
+                  <div>是：当前工序报工时需要进行质检确认</div>
+                  <div>质检合格数量作为最终生产数量</div>
+                </div>
+                <el-select v-model="form.isCheck">
+                  <el-option
+                    v-for="dict in dict.type.sys_yes_no"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="准备时间" prop="defaultPreTime">
+              <el-tooltip
+                effect="dark"
+                content="当前系统支持的最小时间粒度为1小时"
+                placement="right"
+              >
+                <el-input-number
+                  :min="0"
+                  :step="1"
+                  v-model="form.defaultPreTime"
+                  placeholder="请输入准备时间"
+                />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="等待时间" prop="defaultSufTime">
+              <el-input-number
+                :min="0"
+                :step="1"
+                v-model="form.defaultSufTime"
+                placeholder="请输入等待时间"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否工艺节点" prop="idid">
+              <el-radio-group v-model="form.idid">
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="1">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="选择设备类型" prop="machineryTypeId">
+              <treeselect
+                v-model="form.machineryTypeId"
+                :options="machineryTypeOptions"
+                :normalizer="normalizer"
+                placeholder="请选择设备类型"
+                @select="handleNodeClick"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col
+            :span="12"
+            v-if="this.form.code == 'CNC' || this.form.code == 'ROBOT'"
+          >
+            <el-form-item label="选择代码" prop="url">
+              <el-select
+                v-model="form.originalName"
+                value-key="codeId"
+                @change="selectSource($event)"
+              >
+                <el-option
+                  v-for="item in machineryList"
+                  :key="item.codeId"
+                  :label="item.codeName"
+                  :value="{ url: item.codeId, originalName: item.code }"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12" v-if="this.form.code == 'STORE'">
+            <el-form-item label="选择出入库类型" prop="exitType">
+              <el-radio-group v-model="form.exitType">
+                <el-radio label="0">出库</el-radio>
+                <el-radio label="1">入库</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col
+            :span="12"
+            v-if="
+              this.form.code == 'AGV_TRANSMIT' ||
+              this.form.code == 'TRANSMIT' ||
+              this.form.code == 'ROBOT_TRANSMIT'
+            "
+          >
+            <el-form-item label="传送带转动方向" prop="rotationDirection">
+              <el-radio-group v-model="form.rotationDirection">
+                <el-radio label="0">正转</el-radio>
+                <el-radio label="1">反转</el-radio>
+                <el-radio label="2">停止</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="this.form.code == 'ROBOT_TRANSMIT'">
+            <el-form-item label="传送带位置" prop="conveyNumber">
+              <el-radio-group v-model="form.conveyNumber">
+                <el-radio label="1">1号传送带</el-radio>
+                <el-radio label="2">2号传送带</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="this.form.code == 'CNC'">
+            <el-form-item label="安全门状态" prop="securityDoor">
+              <el-radio-group v-model="form.securityDoor">
+                <el-radio label="0">开启</el-radio>
+                <el-radio label="1">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12" v-if="this.form.code == 'AGV'">
+            <el-form-item label="选择线路" prop="lineId">
+              <el-select
+                v-model="form.lineId"
+                placeholder="请选择线路"
+                style="width: 100%"
+                value-key="proAgvlineId"
+              >
+                <el-option
+                  v-for="item in workshopOptions"
+                  :key="item.proAgvlineId"
+                  :label="item.lineName"
+                  :value="item.proAgvlineId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="this.form.code == 'AGV'">
+            <el-form-item label="选择点位" prop="pointId">
+              <el-select
+                v-model="form.pointId"
+                placeholder="请选择点位"
+                style="width: 100%"
+                value-key="proAgvsiteId"
+              >
+                <el-option
+                  v-for="item in dvsubjectList"
+                  :key="item.proAgvsiteId"
+                  :label="item.siteName"
+                  :value="item.proAgvsiteId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -214,13 +448,34 @@
 </template>
 
 <script>
-import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/mes/pro/routeprocess";
-import {listAllProcess} from "@/api/mes/pro/process";
+import { list } from "@/api/management/codeprogram";
+import { findProAgvline } from "@/api/mes/dv/route";
+import { findProAgvsite } from "@/api/mes/dv/siteConfiguration";
+import {
+  listRouteprocess,
+  getRouteprocess,
+  delRouteprocess,
+  addRouteprocess,
+  updateRouteprocess,
+  listRouteprocessTwo,
+} from "@/api/mes/pro/routeprocess";
+import { listProcess } from "@/api/mes/pro/process";
+import { getToken } from "@/utils/auth";
+import {
+  listMachinerytype,
+  getMachinerytype,
+} from "@/api/mes/dv/machinerytype";
+import * as listType from "@/api/mes/pro/processType";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Routeprocess",
-  dicts: ['mes_link_type','sys_yes_no'],
+  dicts: ["mes_link_type", "sys_yes_no"],
+  components: { Treeselect },
   data() {
     return {
+      // 设置上传的请求头部
+      headers: { Authorization: "Bearer " + getToken() },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -236,7 +491,7 @@ export default {
       // 工艺组成表格数据
       routeprocessList: [],
       //工序选项
-      processOptions:[],    
+      processOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -258,57 +513,241 @@ export default {
         defaultSufTime: null,
         colorCode: null,
       },
+      // 设备类型树选项
+      machineryTypeOptions: [],
+      machineryTypeOptions1: [],
+      fileList: [],
+      //车间线路
+      workshopOptions: [],
+      // 站点
+      dvsubjectList: [],
+      lineName: "",
+      pointName: "",
+      TypeId: false,
+      Typefile: false,
+      warehousing: false,
       // 表单参数
-      form: {},
+      form: {
+        originalName: "",
+        url: "",
+        lineId: "",
+        pointId: "",
+        code: null,
+      },
+      machineryList: [],
+      formArr: "",
+      popArr: "",
       // 表单校验
       rules: {
         routeId: [
-          { required: true, message: "工艺路线ID不能为空", trigger: "blur" }
+          { required: true, message: "工艺路线ID不能为空", trigger: "blur" },
         ],
         processId: [
-          { required: true, message: "工序ID不能为空", trigger: "blur" }
+          { required: true, message: "工序ID不能为空", trigger: "blur" },
         ],
         nextProcessId: [
-          { required: true, message: "工序ID不能为空", trigger: "blur" }
+          { required: true, message: "工序ID不能为空", trigger: "blur" },
         ],
         keyFlag: [
-        { required: true, message: "请指定当前工序是否关键工序", trigger: "blur" }
+          {
+            required: true,
+            message: "请指定当前工序是否关键工序",
+            trigger: "blur",
+          },
         ],
         isCheck: [
-        { required: true, message: "请指定当前工序是否需要质检确认", trigger: "blur" }
-        ]
-      }
+          {
+            required: true,
+            message: "请指定当前工序是否需要质检确认",
+            trigger: "blur",
+          },
+        ],
+        processTypeId: [
+          { required: true, message: "请选择工序类型", trigger: "blur" },
+        ],
+        idid: [
+          { required: true, message: "请选择是否工艺节点", trigger: "blur" },
+        ],
+      },
     };
   },
-  props :{
-      routeId: undefined,
-      optType: undefined
+  props: {
+    routeId: undefined,
+    optType: undefined,
   },
   created() {
     this.getList();
-    this.getProcess();
+    // this.getProcess();
+    this.getTreeselect();
+    this.getWorkshops();
   },
   methods: {
     /** 查询工艺组成列表 */
     getList() {
       this.loading = true;
-      listRouteprocess(this.queryParams).then(response => {
+      listRouteprocess(this.queryParams).then((response) => {
         this.routeprocessList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    //查询工序信息
-    getProcess(){
-      listAllProcess().then( response =>{
-        this.processOptions = response.data;
+    // //查询工序信息
+    // getProcess() {
+    //   listAllProcess().then((response) => {
+    //     this.processOptions = response.data;
+    //   });
+    // },
+    getWorkshops() {
+      findProAgvline().then((response) => {
+        this.workshopOptions = response.rows;
       });
+      findProAgvsite().then((response) => {
+        this.dvsubjectList = response.rows;
+      });
+    },
+    /** 查询设备类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then((response) => {
+        this.machineryTypeOptions = [];
+        const data = this.handleTree(
+          response.data,
+          "machineryTypeId",
+          "parentTypeId"
+        )[0];
+        this.machineryTypeOptions.push(data);
+      });
+      listType.listMachinerytype().then((response) => {
+        this.machineryTypeOptions1 = [];
+        const data = this.handleTree(
+          response.data,
+          "processTypeId",
+          "parentTypeId"
+        )[0];
+        this.machineryTypeOptions1.push(data);
+      });
+    },
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.machineryTypeId,
+        label: node.machineryTypeName,
+        children: node.children,
+      };
+    },
+    /** 转换设备类型数据结构 */
+    normalizer1(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.processTypeId,
+        label: node.processTypeName,
+        children: node.children,
+      };
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      console.log(data);
+      if (data.code == "AGV") {
+        this.form.originalName = "";
+        this.form.url = "";
+        this.form.exitType = "";
+      } else if (data.code == "STORE") {
+        this.form.lineId = "";
+        this.form.pointId = "";
+        this.form.exitType = "0";
+        this.form.originalName = "";
+        this.form.url = "";
+      } else if (data.code == "CNC" || data.code == "ROBOT") {
+        this.form.lineId = "";
+        this.form.pointId = "";
+        this.form.exitType = "";
+      } else {
+        this.form.lineId = "";
+        this.form.pointId = "";
+        this.form.exitType = "";
+        this.form.originalName = "";
+        this.form.url = "";
+      }
+      this.form.machineryTypeName = data.machineryTypeName;
+      this.form.code = data.code;
+      var arr = { machineryTypeId: data.machineryTypeId };
+      list(arr).then((response) => {
+        this.machineryList = response.data;
+      });
+    },
+    handleNodeProcess(data) {
+      var arr = { processTypeId: data.processTypeId };
+      listProcess(arr).then((response) => {
+        this.processOptions = response.rows;
+      });
+    },
+    selectSource(e) {
+      console.log(e);
+      this.form.url = e.url;
+      this.form.originalName = e.originalName;
     },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
+    beforeUpload(e) {
+      // console.log(e);
+      this.files = e;
+    },
+    customUploadChangeImage2(files) {
+      if (files.status === "ready") return;
+      if (files.status === "success") {
+        const res = files.response || {};
+        if (res && res.code === 200) {
+          this.form.url = files.response.url;
+          this.form.originalName = files.response.originalFileName;
+          this.$message({
+            type: "success",
+            message: "上传成功!",
+          });
+          this.uploadVisible = false;
+        } else {
+          this.$message.error("上传失败!");
+          this.fileList = [];
+        }
+      } else {
+        this.$message.error("上传失败!");
+        this.fileList = [];
+      }
+    },
+
+    // 删除文件
+    beforeRemove(files, fileList) {
+      return this.$confirm(`确定移除 ${files.name}？`);
+    },
+
+    // 上传按钮 限制图文件大小和类型
+    handleChangeUpload(file, fileList) {
+      const isLt2M = file.size / 1024 / 1024 < 10;
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 10MB!");
+        return false;
+      }
+    },
+    handleExceedImage1(file, fileList) {
+      // console.log(file);
+      this.$message.warning(`当前限制上传 1 个文件，以上传 ${file.length} 个`);
+    },
+
+    //预览文件
+    previewFile() {
+      if (this.form.url != undefined && this.form.url != "") {
+        var url = this.form.url;
+        window.open(url);
+      } else {
+        this.$message.warning(`请上传文件`);
+      }
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -317,15 +756,16 @@ export default {
         processId: null,
         processCode: null,
         processName: null,
-        isCheck: 'N',
+        isCheck: "N",
+        keyFlag: "N",
         orderNum: 1,
         nextProcessId: null,
         nextProcessCode: null,
         nextProcessName: null,
-        linkType: null,
+        linkType: "FS",
         defaultPreTime: 0,
         defaultSufTime: 0,
-        colorCode: '#00AEF3',
+        colorCode: "#00AEF3",
         remark: null,
         attr1: null,
         attr2: null,
@@ -334,8 +774,18 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        originalName: null,
+        url: null,
+        lineId: null,
+        pointId: null,
+        exitType: "0",
+        rotationDirection: "0",
+        processTypeId: null,
+        code: null,
+        securityDoor: null,
       };
+      this.fileList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -350,41 +800,102 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.recordId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.recordId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      if (this.form.code == null) {
+        this.TypeId = false;
+        this.Typefile = false;
+        this.warehousing = false;
+        this.form.originalName = "";
+        this.form.url = "";
+        this.form.exitType = "";
+        this.form.lineId = "";
+        this.form.pointId = "";
+      }
       this.open = true;
       this.title = "添加工艺组成";
+      listRouteprocess({ routeId: this.routeId }).then((response) => {
+        this.popArr = response.total;
+        this.form.orderNum = response.total + 1;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row);
       this.reset();
-      const recordId = row.recordId || this.ids
-      getRouteprocess(recordId).then(response => {
+      this.formArr = row.orderNum;
+      const recordId = row.recordId || this.ids;
+      getRouteprocess(recordId).then((response) => {
         this.form = response.data;
-        this.open = true;
-        this.title = "修改工艺组成";
+        getMachinerytype(row.machineryTypeId).then((response) => {
+          this.form.code = response.data.code;
+          this.open = true;
+          this.title = "修改工艺组成";
+        });
       });
+
+      var arr = { machineryTypeId: row.machineryTypeId };
+      list(arr).then((response) => {
+        this.machineryList = response.data;
+      });
+      var arr1 = { processTypeId: row.processTypeId };
+      listProcess(arr1).then((response) => {
+        this.processOptions = response.rows;
+      });
+      var name = {};
+      if (row.originalName != undefined && row.originalName != "") {
+        this.$set(name, "name", row.originalName);
+        this.fileList.push(name);
+      }
     },
+    process() {
+      listRouteprocess({ routeId: this.routeId }).then((response) => {
+        const dataAfterThree = [];
+        response.rows.forEach((item, index) => {
+          dataAfterThree.push(item);
+        });
+        const mappedArray = [];
+        for (let i = 1; i <= dataAfterThree.length; i++) {
+          mappedArray[i] = dataAfterThree[i - 1];
+        }
+        mappedArray.forEach((item, index) => {
+          item.orderNum = index;
+          updateRouteprocess(item).then((response) => {
+            updateRouteprocess(item).then((response) => {});
+          });
+          this.getList();
+        });
+      });
+      this.getList();
+    },
+
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.recordId != null) {
-            updateRouteprocess(this.form).then(response => {
+            if (this.form.orderNum < this.formArr) {
+              this.form.orderNum = this.form.orderNum - 1;
+            }
+            updateRouteprocess(this.form).then((response) => {
+              this.process();
+              this.getList();
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
             });
           } else {
-            addRouteprocess(this.form).then(response => {
+            addRouteprocess(this.form).then((response) => {
+              if (this.form.orderNum < this.popArr) {
+                this.process();
+              }
+              this.getList();
               this.$modal.msgSuccess("新增成功");
               this.open = false;
-              this.getList();
             });
           }
         }
@@ -393,19 +904,28 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const recordIds = row.recordId || this.ids;
-      this.$modal.confirm('是否确认删除工艺组成编号为"' + recordIds + '"的数据项？').then(function() {
-        return delRouteprocess(recordIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除工艺组成编号为"' + recordIds + '"的数据项？')
+        .then(function () {
+          return delRouteprocess(recordIds);
+        })
+        .then(() => {
+          this.process();
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/pro/routeprocess/export', {
-        ...this.queryParams
-      }, `routeprocess_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "mes/pro/routeprocess/export",
+        {
+          ...this.queryParams,
+        },
+        `routeprocess_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue
index 91400b9..783ca6d 100644
--- a/src/views/mes/pro/schedule/index.vue
+++ b/src/views/mes/pro/schedule/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="工单编码" prop="workorderCode">
         <el-input
           v-model="queryParams.workorderCode"
@@ -60,86 +67,205 @@
         />
       </el-form-item>
       <el-form-item label="需求日期" prop="requestDate">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.requestDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择需求日期">
+          placeholder="请选择需求日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>        
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-refresh" v-hasPermi="['mes:pro:protask:list']" circle="" @click="getList"></el-button>
-        <el-button type="primary" icon="el-icon-edit" v-hasPermi="['mes:pro:protask:edit']" circle="" @click="handleOpenGantt"></el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-refresh"
+          v-hasPermi="['mes:pro:protask:list']"
+          circle=""
+          @click="getList"
+        ></el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          v-hasPermi="['mes:pro:protask:edit']"
+          circle=""
+          @click="handleOpenGantt"
+        ></el-button>
       </el-form-item>
     </el-form>
     <div class="wrapper">
       <div class="container">
-        <GanttChar class="left-container" ref="ganttChar" :tasks="tasks"></GanttChar>
-      </div>      
-    </div>    
+        <GanttChar
+          class="left-container"
+          ref="ganttChar"
+          :tasks="tasks"
+        ></GanttChar>
+      </div>
+    </div>
+
+    <el-row :gutter="10" class="mb8" style="margin-top: 10px">
+      <el-col :span="1.5">
+        <el-button type="primary" plain size="mini" @click="handleproductione"
+          >批量执行生产</el-button
+        >
+      </el-col>
+    </el-row>
+
     <el-table
       v-loading="loading"
       :data="workorderList"
       row-key="workorderId"
       default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      @selection-change="handleSelectionChange"
     >
-      <el-table-column label="工单编码" width="180" prop="workorderCode" >
+      <el-table-column
+        type="selection"
+        width="55"
+        align="center"
+        :selectable="selectable"
+      />
+
+      <el-table-column label="工单编码" width="180" prop="workorderCode">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:pro:protask:query']"
-          >{{scope.row.workorderCode}}</el-button>
+            >{{ scope.row.workorderCode }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column label="工单名称" width="200" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
-      <el-table-column label="工单来源" align="center" prop="orderSource" >
+      <el-table-column
+        label="工单名称"
+        width="200"
+        align="center"
+        prop="workorderName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="工单来源" align="center" prop="orderSource">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/>
+          <dict-tag
+            :options="dict.type.mes_workorder_sourcetype"
+            :value="scope.row.orderSource"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />
-      <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
-      <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
-      <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="订单编号"
+        width="140"
+        align="center"
+        prop="sourceCode"
+      />
+      <el-table-column
+        label="产品编号"
+        width="120"
+        align="center"
+        prop="productCode"
+      />
+      <el-table-column
+        label="产品名称"
+        width="200"
+        align="center"
+        prop="productName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="productSpc"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-      <el-table-column label="工单数量" align="center" prop="quantity" />                 
+      <el-table-column label="计划数量" align="center" prop="quantity" />
       <el-table-column label="调整数量" align="center" prop="quantityChanged" />
-      <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> 
+      <el-table-column
+        label="已生产数量"
+        align="center"
+        width="100px"
+        prop="quantityProduced"
+      />
       <el-table-column label="客户编码" align="center" prop="clientCode" />
-      <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
-      <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
+      <el-table-column
+        label="客户名称"
+        align="center"
+        prop="clientName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="需求日期"
+        align="center"
+        prop="requestDate"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="排产状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.mes_order_status"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150px" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        width="150px"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='CONFIRMED'"
+            v-if="scope.row.status == 'PRODUCTION'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:protask:edit']"
-          >排产</el-button>
+            >排产</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status == 'PRODUCTION'"
+            @click="handleproductione(scope.row)"
+            >执行生产</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status == 'WORKING'"
+            @click="Pendingproduction(scope.row)"
+            >暂停生产</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status == 'SUSPENDED'"
+            @click="handleSuspended(scope.row)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -147,7 +273,12 @@
     />
 
     <!-- 添加或修改生产工单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1550px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -159,26 +290,27 @@
             <el-form-item label="工单名称" prop="workorderName">
               <el-input v-model="form.workorderName" readonly="readonly" />
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="来源类型" prop="orderSource">              
+          <el-col :span="12">
+            <el-form-item label="来源类型" prop="orderSource">
               <el-radio-group v-model="form.orderSource" disabled>
                 <el-radio
                   v-for="dict in dict.type.mes_workorder_sourcetype"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>            
+                  >{{ dict.label }}</el-radio
+                >
+              </el-radio-group>
             </el-form-item>
-          </el-col>                    
-          <el-col :span="8" v-if="form.orderSource == 'ORDER'">
+          </el-col>
+          <el-col :span="12" v-if="form.orderSource == 'ORDER'">
             <el-form-item label="订单编号" prop="sourceCode">
               <el-input v-model="form.sourceCode" readonly="readonly" />
             </el-form-item>
-          </el-col>         
-          <el-col :span="8">
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="排产状态" prop="status">
               <el-select v-model="form.status" disabled>
                 <el-option
@@ -189,12 +321,12 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="产品编号" prop="productCode">
-              <el-input v-model="form.productCode" readonly="readonly" >
+              <el-input v-model="form.productCode" readonly="readonly">
               </el-input>
             </el-form-item>
           </el-col>
@@ -202,7 +334,7 @@
             <el-form-item label="产品名称" prop="productName">
               <el-input v-model="form.productName" readonly="readonly" />
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -214,29 +346,31 @@
             <el-form-item label="单位" prop="unitOfMeasure">
               <el-input v-model="form.unitOfMeasure" readonly="readonly" />
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="工单数量" prop="quantity">
+            <el-form-item label="计划数量" prop="quantity">
               <el-input v-model="form.quantity" readonly="readonly" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="需求日期" prop="requestDate">
-              <el-date-picker disabled
+              <el-date-picker
+                disabled
                 v-model="form.requestDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择需求日期">
+                placeholder="请选择需求日期"
+              >
               </el-date-picker>
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row v-if="form.orderSource == 'ORDER'">
           <el-col :span="12">
             <el-form-item label="客户编号" prop="clientCode">
-              <el-input v-model="form.clientCode" readonly="readonly" >
+              <el-input v-model="form.clientCode" readonly="readonly">
               </el-input>
             </el-form-item>
           </el-col>
@@ -250,23 +384,69 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" readonly="readonly" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                readonly="readonly"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-steps :active="activeProcess" v-if="form.workorderId !=null" align-center simple>
-        <el-step  v-for="(item,index) in processOptions"
-                  :title="item.processName" @click.native="handleStepClick(index)">           
-        </el-step>
-      </el-steps>
-      <el-card v-for=" (item,index) in processOptions " :key="index" v-if="activeProcess == index && form.workorderId !=null">
-        <ProTask :workorderId="form.workorderId" :routeId="item.routeId" :processId="item.processId" :colorCode="item.colorCode" :optType="optType"></ProTask>
+      <el-scrollbar style="height: 100%; background: #f5f7fa">
+        <el-steps
+          :active="activeProcess"
+          v-if="form.workorderId != null"
+          align-center
+          simple
+        >
+          <el-step
+            v-for="(item, index) in processOptions"
+            :title="item.processName"
+            @click.native="handleStepClick(index)"
+          >
+          </el-step>
+        </el-steps>
+      </el-scrollbar>
+
+      <el-card
+        v-for="(item, index) in processOptions"
+        :key="index"
+        v-if="activeProcess == index && form.workorderId != null"
+      >
+        <ProTask
+          :workorderId="form.workorderId"
+          :routeId="item.routeId"
+          :processId="item.processId"
+          :colorCode="item.colorCode"
+          :orderNum="item.orderNum"
+          :optType="optType"
+          :recordId="item.recordId"
+        ></ProTask>
       </el-card>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
-        <el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view'  && form.workorderId !=null">完成</el-button>
+        <el-button
+          type="primary"
+          @click="cancel"
+          v-if="optType == 'view' || form.status != 'PREPARE'"
+          >返回</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
+          >确 定</el-button
+        >
+        <el-button
+          type="success"
+          @click="handleFinish"
+          v-if="
+            form.status == 'PREPARE' &&
+            optType != 'view' &&
+            form.workorderId != null
+          "
+          >完成</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -274,8 +454,16 @@
 </template>
 
 <script>
-import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder } from "@/api/mes/pro/workorder";
-import {listGanttTaskList} from "@/api/mes/pro/protask";
+import axios from "axios";
+import {
+  listWorkorder,
+  getWorkorder,
+  delWorkorder,
+  addWorkorder,
+  updateWorkorder,
+  deleteShopFace,
+} from "@/api/mes/pro/workorder";
+import { listGanttTaskList } from "@/api/mes/pro/protask";
 import { listProductprocess } from "@/api/mes/pro/routeprocess";
 import ProTask from "./proTask.vue";
 import GanttChar from "./ganttx.vue";
@@ -284,16 +472,16 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Workorder",
-  dicts: ['mes_order_status','mes_workorder_sourcetype'],
+  dicts: ["mes_order_status", "mes_workorder_sourcetype"],
   components: {
     Treeselect,
     ProTask,
-    GanttChar
+    GanttChar,
   },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: true,
       optType: undefined,
       activeProcess: 0,
       // 遮罩层
@@ -322,7 +510,7 @@ export default {
         pageSize: 10,
         workorderCode: null,
         workorderName: null,
-        workorderType: 'SELF', //这里的排产要排除自产之外的外协和外购
+        workorderType: "SELF", //这里的排产要排除自产之外的外协和外购
         orderSource: null,
         sourceCode: null,
         productId: null,
@@ -340,14 +528,15 @@ export default {
         requestDate: null,
         parentId: null,
         ancestors: null,
-        status: 'CONFIRMED',
+        status: null,
       },
-      tasks:{
+      tasks: {
         data: [],
-        links: []
+        links: [],
       },
       // 表单参数
       form: {},
+      ids: "",
     };
   },
   created() {
@@ -358,17 +547,21 @@ export default {
     /** 查询生产工单列表 */
     getList() {
       this.loading = true;
-      listWorkorder(this.queryParams).then(response => {
-        this.workorderList = this.handleTree(response.rows, "workorderId", "parentId");
+      listWorkorder(this.queryParams).then((response) => {
+        this.workorderList = this.handleTree(
+          response.rows,
+          "workorderId",
+          "parentId"
+        );
         this.total = response.total;
         this.loading = false;
       });
     },
-    handleOpenGantt(){
-      this.$router.push({ path: '/mes/pro/schedule/ganttedit'})
+    handleOpenGantt() {
+      this.$router.push({ path: "/mes/pro/schedule/ganttedit" });
     },
-    getGanttTasks(){
-      listGanttTaskList(this.queryParams).then(response =>{
+    getGanttTasks() {
+      listGanttTaskList(this.queryParams).then((response) => {
         this.tasks.data = response.data.data;
         this.tasks.links = response.data.links;
         this.$refs.ganttChar.reload();
@@ -376,10 +569,10 @@ export default {
     },
 
     //获取当前产品对应的生产工序
-    getProcess(){
-        listProductprocess(this.form.productId).then(response =>{
-            this.processOptions = response.data;
-        });
+    getProcess() {
+      listProductprocess(this.form.productId).then((response) => {
+        this.processOptions = response.data;
+      });
     },
 
     /** 转换生产工单数据结构 */
@@ -390,15 +583,23 @@ export default {
       return {
         id: node.workorderId,
         label: node.workorderName,
-        children: node.children
+        children: node.children,
       };
     },
-	/** 查询生产工单下拉树结构 */
+    /** 查询生产工单下拉树结构 */
     getTreeselect() {
-      listWorkorder().then(response => {
+      listWorkorder().then((response) => {
         this.workorderOptions = [];
-        const data = { workorderId: 0, workorderName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "workorderId", "parentId");
+        const data = {
+          workorderId: 0,
+          workorderName: "顶级节点",
+          children: [],
+        };
+        data.children = this.handleTree(
+          response.data,
+          "workorderId",
+          "parentId"
+        );
         this.workorderOptions.push(data);
       });
     },
@@ -434,19 +635,19 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null        
+        updateTime: null,
       };
-      this.activeProcess =0;
-      this.autoGenFlag = false;
+      this.activeProcess = 0;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     //甘特图按钮点击
-    openGanttChart(){
-      this.$refs.ganttChar.showFlag =true;
+    openGanttChart() {
+      this.$refs.ganttChar.showFlag = true;
     },
     //Step点击
-    handleStepClick(index){
-        this.activeProcess =index;
+    handleStepClick(index) {
+      this.activeProcess = index;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -457,8 +658,87 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.workorderId);
+    },
+    // 执行生产
+    handleproductione(row) {
+      const routeId = row.workorderId || this.ids;
+      if (routeId !== "") {
+        axios
+          .get("http://192.168.2.104:8077/manage/task/execute?ids=" + routeId)
+          // .get("http://192.168.50.191:8077/manage/task/execute?ids=" + routeId)
+          // .get("http://127.0.0.1:8077/manage/task/execute?ids=" + routeId)
+          .then((res) => {
+            if (res.data.code === 200) {
+              this.getList();
+              this.$message({
+                showClose: true,
+                message: "执行成功",
+                type: "success",
+              });
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+      } else {
+        this.$message({
+          message: "请选择要执行的工单",
+          type: "warning",
+        });
+      }
+    },
+
+    // 暂停生产
+    Pendingproduction(row) {
+      const routeId = row.workorderId || this.ids;
+      axios
+        .get("http://192.168.2.104:8077/manage/task/suspension?id=" + routeId)
+        // .get("http://192.168.50.191:8077/manage/task/suspension?id=" + routeId)
+        // .get("http://127.0.0.1:8077/manage/task/suspension?id=" + routeId)
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.getList();
+            this.$message({
+              showClose: true,
+              message: "已暂停",
+              type: "success",
+            });
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        });
+    },
+    // 删除
+    handleSuspended(row) {
+      const workorderId = row.workorderId || this.ids;
+      this.$modal
+        .confirm("确认删除数据项？")
+        .then(() => {
+          deleteShopFace({ workorderId: workorderId }).then((response) => {
+            console.log(response);
+            if (response.code === 200) {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        })
+        .catch(() => {});
+    },
+
+    selectable(row, index) {
+      if (row.status == "WORKING" || row.status == "PREPARE") {
+        return false;
+      } else {
+        return true;
+      }
+    },
+
     //从BOM行中直接新增
-    handleSubAdd(row){
+    handleSubAdd(row) {
       this.open = false;
       this.reset();
       this.getTreeselect();
@@ -472,7 +752,7 @@ export default {
       }
       this.open = true;
       this.title = "添加生产工单";
-      this.optType="add";
+      this.optType = "add";
     },
     /** 新增按钮操作 */
     handleAdd(row) {
@@ -490,14 +770,17 @@ export default {
       }
       this.open = true;
       this.title = "添加生产工单";
-      this.optType="add";
+      this.optType = "add";
+      genCode("WORKORDER_CODE").then((response) => {
+        this.form.workorderCode = response;
+      });
     },
     // 查询明细按钮操作
-    handleView(row){
-      this.reset();      
+    handleView(row) {
+      this.reset();
       this.getTreeselect();
       const workorderId = row.workorderId || this.ids;
-      getWorkorder(workorderId).then(response => {
+      getWorkorder(workorderId).then((response) => {
         this.form = response.data;
         this.getProcess();
         this.open = true;
@@ -512,27 +795,27 @@ export default {
       if (row != null) {
         this.form.parentId = row.workorderId;
       }
-      getWorkorder(row.workorderId).then(response => {
+      getWorkorder(row.workorderId).then((response) => {
         this.form = response.data;
         this.getProcess();
         this.open = true;
         this.title = "生产排产";
-        this.optType="edit";
+        this.optType = "edit";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.workorderId != null) {
-            updateWorkorder(this.form).then(response => {
+            updateWorkorder(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               //this.open = false;
               this.$refs["bomlist"].getList();
               this.getList();
             });
           } else {
-            addWorkorder(this.form).then(response => {
+            addWorkorder(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               //this.open = false;
               this.form.workorderId = response.data;
@@ -544,66 +827,78 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除生产工单编号为"' + row.workorderId + '"的数据项？').then(function() {
-        return delWorkorder(row.workorderId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm(
+          '是否确认删除生产工单编号为"' + row.workorderId + '"的数据项？'
+        )
+        .then(function () {
+          return delWorkorder(row.workorderId);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
-    handleSelectProduct(){
+    handleSelectProduct() {
       this.$refs.itemSelect.showFlag = true;
     },
-    handleSelectClient(){
+    handleSelectClient() {
       this.$refs.clientSelect.showFlag = true;
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/pro/workorder/export', {
-        ...this.queryParams
-      }, `workorder_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/pro/workorder/export",
+        {
+          ...this.queryParams,
+        },
+        `workorder_${new Date().getTime()}.xlsx`
+      );
     },
-    handleFinish(){
+    handleFinish() {
       let that = this;
-      this.$modal.confirm('是否完成工单编制？【完成后将不能更改】').then(function(){
-        that.form.status = 'CONFIRMED';
-        that.submitForm();
-      });
+      this.$modal
+        .confirm("是否完成工单编制？【完成后将不能更改】")
+        .then(function () {
+          that.form.status = "CONFIRMED";
+          that.submitForm();
+        });
     },
     //物料选择弹出框
-    onItemSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.productId = obj.itemId;
-          this.form.productCode = obj.itemCode;
-          this.form.productName = obj.itemName;
-          this.form.productSpc = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
-        }
+    onItemSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.productId = obj.itemId;
+        this.form.productCode = obj.itemCode;
+        this.form.productName = obj.itemName;
+        this.form.productSpc = obj.specification;
+        this.form.unitOfMeasure = obj.unitOfMeasure;
+      }
     },
     //客户选择弹出框
-    onClientSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.clientId = obj.clientId;
-          this.form.clientCode = obj.clientCode;
-          this.form.clientName = obj.clientName;
-        }
+    onClientSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.clientId = obj.clientId;
+        this.form.clientCode = obj.clientCode;
+        this.form.clientName = obj.clientName;
+      }
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('WORKORDER_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("WORKORDER_CODE").then((response) => {
           this.form.workorderCode = response;
         });
-      }else{
+      } else {
         this.form.workorderCode = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
-.wrapper{
-    height: 400px;
+.wrapper {
+  height: 400px;
 }
 .container {
   height: 100%;
diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue
index bc7ed19..4c022bd 100644
--- a/src/views/mes/pro/schedule/proTask.vue
+++ b/src/views/mes/pro/schedule/proTask.vue
@@ -70,7 +70,7 @@
           <el-color-picker v-model="scope.row.colorCode" disabled></el-color-picker>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="150px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -126,7 +126,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="开始时间" prop="startTime">
               <el-date-picker clearable
                 v-model="form.startTime"
@@ -136,7 +136,7 @@
                 placeholder="请选择开始生产时间">
               </el-date-picker>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="生产时长" prop="duration">
               <el-input-number :min="1" :precision="0" :step="1" v-model="form.duration" @change="calculateEndTime" placeholder="请输入生产时长" />
@@ -220,6 +220,7 @@ export default {
         endTime: null,
         colorCode: null,
         requestDate: null,
+        orderNum: this.orderNum,
       },
       // 表单参数
       form: {},
@@ -245,7 +246,9 @@ export default {
       colorCode: null,
       routeId: null,
       processId: null,
-      optType: null
+      optType: null,
+      recordId:null,
+      orderNum:null,
   },
   created() {
     this.getList();
@@ -295,6 +298,7 @@ export default {
     reset() {
       this.form = {
         taskId: null,
+        recordId: this.recordId,
         taskCode: null,
         taskName: null,
         workorderId: this.workorderId,
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index fc7a94e..958b7cb 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="工单编码" prop="workorderCode">
         <el-input
           v-model="queryParams.workorderCode"
@@ -68,20 +75,30 @@
         />
       </el-form-item>
       <el-form-item label="需求日期" prop="requestDate">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.requestDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择需求日期">
+          placeholder="请选择需求日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
-<el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -90,7 +107,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:pro:workorder:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -101,7 +119,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:pro:workorder:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -112,7 +131,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:pro:workorder:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -122,9 +142,13 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:pro:workorder:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <el-table
@@ -132,89 +156,158 @@
       :data="workorderList"
       row-key="workorderId"
       default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column label="工单编码" width="180" prop="workorderCode" >
+      <el-table-column label="工单编码" width="180" prop="workorderCode">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:pro:workorder:query']"
-          >{{scope.row.workorderCode}}</el-button>
+            >{{ scope.row.workorderCode }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column label="工单名称" width="200" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
-      <el-table-column label="工单类型" align="center" prop="workorderType" >
+      <el-table-column
+        label="工单名称"
+        width="200"
+        align="center"
+        prop="workorderName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="工单类型" align="center" prop="workorderType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType"/>
+          <dict-tag
+            :options="dict.type.mes_workorder_type"
+            :value="scope.row.workorderType"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="工单来源" align="center" prop="orderSource" >
+      <el-table-column label="工单来源" align="center" prop="orderSource">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/>
+          <dict-tag
+            :options="dict.type.mes_workorder_sourcetype"
+            :value="scope.row.orderSource"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />
-      <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
-      <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
-      <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="订单编号"
+        width="140"
+        align="center"
+        prop="sourceCode"
+      />
+      <el-table-column
+        label="产品编号"
+        width="120"
+        align="center"
+        prop="productCode"
+      />
+      <el-table-column
+        label="产品名称"
+        width="200"
+        align="center"
+        prop="productName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="productSpc"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-      <el-table-column label="工单数量" align="center" prop="quantity" />                 
+      <el-table-column label="计划数量" align="center" prop="quantity" />
       <el-table-column label="调整数量" align="center" prop="quantityChanged" />
-      <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> 
-      <el-table-column label="批次号" align="center" width="100px" prop="batchCode" />
+      <el-table-column
+        label="已生产数量"
+        align="center"
+        width="100px"
+        prop="quantityProduced"
+      />
+      <el-table-column
+        label="批次号"
+        align="center"
+        width="100px"
+        prop="batchCode"
+      />
       <el-table-column label="客户编码" align="center" prop="clientCode" />
-      <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
-      <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
+      <el-table-column
+        label="客户名称"
+        align="center"
+        prop="clientName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="需求日期"
+        align="center"
+        prop="requestDate"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.mes_order_status"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150px" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        width="150px"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:workorder:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
-            v-if="scope.row.status =='CONFIRMED' && scope.row.workorderType =='SELF'"
+            v-if="
+              scope.row.status == 'CONFIRMED' &&
+              scope.row.workorderType == 'SELF'
+            "
             @click="handleAdd(scope.row)"
             v-hasPermi="['mes:pro:workorder:update']"
-          >新增</el-button>
+            >新增</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-circle-check"
-            v-if="scope.row.status =='CONFIRMED'"
+            v-if="scope.row.status == 'CONFIRMED'"
             @click="handleFinish(scope.row)"
             v-hasPermi="['mes:pro:workorder:update']"
-          >完成</el-button>
+            >完成</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="scope.row.status == 'PREPARE'"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:pro:workorder:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -227,51 +320,73 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="工单编号" prop="workorderCode">
-              <el-input v-model="form.workorderCode" placeholder="请输入工单编号" />
+              <el-input
+                v-model="form.workorderCode"
+                placeholder="请输入工单编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">               
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view' && form.status == 'PREPARE'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="工单名称" prop="workorderName">
-              <el-input v-model="form.workorderName" placeholder="请输入工单名称" />
+              <el-input
+                v-model="form.workorderName"
+                placeholder="请输入工单名称"
+              />
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="来源类型" prop="orderSource">              
-              <el-radio-group v-model="form.orderSource" disabled v-if="optType=='view'">
+            <el-form-item label="来源类型" prop="orderSource">
+              <el-radio-group
+                v-model="form.orderSource"
+                disabled
+                v-if="optType == 'view'"
+              >
                 <el-radio
                   v-for="dict in dict.type.mes_workorder_sourcetype"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
               <el-radio-group v-model="form.orderSource" v-else>
                 <el-radio
                   v-for="dict in dict.type.mes_workorder_sourcetype"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
-          </el-col>                    
+          </el-col>
           <el-col :span="8" v-if="form.orderSource == 'ORDER'">
             <el-form-item label="订单编号" prop="sourceCode">
-              <el-input v-model="form.sourceCode" placeholder="请输入订单编号" />
+              <el-input
+                v-model="form.sourceCode"
+                placeholder="请输入订单编号"
+              />
             </el-form-item>
-          </el-col>         
+          </el-col>
           <el-col :span="8">
             <el-form-item label="单据状态" prop="status">
-              <el-select v-model="form.status" disabled placeholder="请选择单据状态">
+              <el-select
+                v-model="form.status"
+                disabled
+                placeholder="请选择单据状态"
+              >
                 <el-option
                   v-for="dict in dict.type.mes_order_status"
                   :key="dict.value"
@@ -280,7 +395,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -297,80 +412,135 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="产品编号" prop="productCode">
-              <el-input v-model="form.productCode" placeholder="请选择产品" >
-                <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
+              <el-input v-model="form.productCode" placeholder="请选择产品">
+                <el-button
+                  slot="append"
+                  @click="handleSelectProduct"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
-              <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
+              <ItemSelect ref="itemSelect" @onSelected="onItemSelected">
+              </ItemSelect>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="产品名称" prop="productName">
-              <el-input v-model="form.productName" placeholder="请选择产品" disabled/>
+              <el-input
+                v-model="form.productName"
+                placeholder="请选择产品"
+                disabled
+              />
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="规格型号" prop="productSpc">
-              <el-input v-model="form.productSpc" placeholder="请选择产品" disabled/>
+              <el-input
+                v-model="form.productSpc"
+                placeholder="请选择产品"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单位" prop="unitOfMeasure">
-              <el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/>
+              <el-input
+                v-model="form.unitOfMeasure"
+                placeholder="请选择产品"
+                disabled
+              />
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="工单数量" prop="quantity">
-              <el-input-number :min="1" v-model="form.quantity" placeholder="请输入生产数量" />
+            <el-form-item label="计划数量" prop="quantity">
+              <el-input-number
+                :min="1"
+                v-model="form.quantity"
+                placeholder="请输入计划数量"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="需求日期" prop="requestDate">
-              <el-date-picker clearable
+              <el-date-picker
+                clearable
                 v-model="form.requestDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择需求日期">
+                placeholder="请选择需求日期"
+              >
               </el-date-picker>
             </el-form-item>
-          </el-col>     
+          </el-col>
           <el-col :span="8">
             <el-form-item label="批次号" prop="batchCode">
               <el-input v-model="form.batchCode" placeholder="请输入批次号" />
             </el-form-item>
-          </el-col>     
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工件数量" prop="workpieceType">
+              <el-radio-group v-model="form.workpieceType">
+                <el-radio label="1">一个托盘单工件</el-radio>
+                <el-radio label="0">一个托盘多工件</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row v-if="form.orderSource == 'ORDER'">
           <el-col :span="12">
             <el-form-item label="客户编码" prop="clientCode">
-              <el-input v-model="form.clientCode" placeholder="请选择客户" >
-                <el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button>
+              <el-input v-model="form.clientCode" placeholder="请选择客户">
+                <el-button
+                  slot="append"
+                  @click="handleSelectClient"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
-              <ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect>
+              <ClientSelect ref="clientSelect" @onSelected="onClientSelected">
+              </ClientSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="客户名称" prop="clientName">
-              <el-input v-model="form.clientName" readonly="readonly" placeholder="请输入客户名称" />
+              <el-input
+                v-model="form.clientName"
+                readonly="readonly"
+                placeholder="请输入客户名称"
+              />
             </el-form-item>
           </el-col>
           <el-col></el-col>
         </el-row>
-        <el-row v-if="form.workorderType == 'OUTSOURCE' || form.workorderType == 'PURCHASE'">
+        <el-row
+          v-if="
+            form.workorderType == 'OUTSOURCE' ||
+            form.workorderType == 'PURCHASE'
+          "
+        >
           <el-col :span="12">
             <el-form-item label="供应商编码" prop="vendorCode">
-              <el-input v-model="form.vendorCode" placeholder="请选择供应商" >
-                <el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
+              <el-input v-model="form.vendorCode" placeholder="请选择供应商">
+                <el-button
+                  slot="append"
+                  @click="handleSelectVendor"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
               <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="供应商名称" prop="vendorName">
-              <el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" />
+              <el-input
+                v-model="form.vendorName"
+                readonly="readonly"
+                placeholder="请选择供应商"
+              />
             </el-form-item>
           </el-col>
           <el-col></el-col>
@@ -383,23 +553,49 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-tabs type="border-card" v-if="form.workorderId != null">        
-        <el-tab-pane label="BOM组成"> 
-          <Workorderbom ref="bomlist" :optType="optType" :workorder="form" @handleAddSub="handleSubAdd" ></Workorderbom>        
-        </el-tab-pane>
-        <el-tab-pane label="物料需求">
-         
+      <el-tabs type="border-card" v-if="form.workorderId != null">
+        <el-tab-pane label="BOM组成">
+          <Workorderbom
+            ref="bomlist"
+            :optType="optType"
+            :workorder="form"
+            @handleAddSub="handleSubAdd"
+          ></Workorderbom>
         </el-tab-pane>
+        <el-tab-pane label="物料需求"> </el-tab-pane>
       </el-tabs>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
-        <el-button type="success" @click="handleConfirm" v-if="form.status =='PREPARE' && optType !='view'  && form.workorderId !=null">确 认</el-button>
+        <el-button
+          type="primary"
+          @click="cancel"
+          v-if="optType == 'view' || form.status != 'PREPARE'"
+          >返回</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
+          >保 存</el-button
+        >
+        <el-button
+          type="success"
+          @click="handleConfirm"
+          v-if="
+            form.status == 'PREPARE' &&
+            optType != 'view' &&
+            form.workorderId != null
+          "
+          >确 认</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -407,31 +603,38 @@
 </template>
 
 <script>
-import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder ,dofinish} from "@/api/mes/pro/workorder";
+import {
+  listWorkorder,
+  getWorkorder,
+  delWorkorder,
+  addWorkorder,
+  updateWorkorder,
+  dofinish,
+} from "@/api/mes/pro/workorder";
 import Workorderbom from "./bom/bom.vue";
 import WorkorderItemList from "./items/item.vue";
-import ItemSelect  from "@/components/itemSelect/single.vue";
+import ItemSelect from "@/components/itemSelect/single.vue";
 import ClientSelect from "@/components/clientSelect/single.vue";
 import VendorSelect from "@/components/vendorSelect/single.vue";
-import {genCode} from "@/api/system/autocode/rule"
+import { genCode } from "@/api/system/autocode/rule";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Workorder",
-  dicts: ['mes_order_status','mes_workorder_sourcetype','mes_workorder_type'],
+  dicts: ["mes_order_status", "mes_workorder_sourcetype", "mes_workorder_type"],
   components: {
     Treeselect,
-    ItemSelect ,
+    ItemSelect,
     ClientSelect,
     VendorSelect,
     Workorderbom,
-    WorkorderItemList
+    WorkorderItemList,
   },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -481,33 +684,33 @@ export default {
       // 表单校验
       rules: {
         workorderCode: [
-          { required: true, message: "工单编码不能为空", trigger: "blur" }
+          { required: true, message: "工单编码不能为空", trigger: "blur" },
         ],
         workorderName: [
-          { required: true, message: "工单名称不能为空", trigger: "blur" }
-        ],
-        workorderType: [
-          { required: true, message: "请选择生产工单类型", trigger: "blur" }
+          { required: true, message: "工单名称不能为空", trigger: "blur" },
         ],
+        // workorderType: [
+        //   { required: true, message: "请选择生产工单类型", trigger: "blur" }
+        // ],
         orderSource: [
-          { required: true, message: "来源类型不能为空", trigger: "blur" }
+          { required: true, message: "来源类型不能为空", trigger: "blur" },
         ],
         productId: [
-          { required: true, message: "产品不能为空", trigger: "blur" }
+          { required: true, message: "产品不能为空", trigger: "blur" },
         ],
         productCode: [
-          { required: true, message: "产品编号不能为空", trigger: "blur" }
+          { required: true, message: "产品编号不能为空", trigger: "blur" },
         ],
         productName: [
-          { required: true, message: "产品名称不能为空", trigger: "blur" }
+          { required: true, message: "产品名称不能为空", trigger: "blur" },
         ],
         quantity: [
-          { required: true, message: "生产数量不能为空", trigger: "blur" }
+          { required: true, message: "生产数量不能为空", trigger: "blur" },
         ],
         requestDate: [
-          { required: true, message: "需求日期不能为空", trigger: "blur" }
+          { required: true, message: "需求日期不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -517,8 +720,12 @@ export default {
     /** 查询生产工单列表 */
     getList() {
       this.loading = true;
-      listWorkorder(this.queryParams).then(response => {
-        this.workorderList = this.handleTree(response.rows, "workorderId", "parentId");
+      listWorkorder(this.queryParams).then((response) => {
+        this.workorderList = this.handleTree(
+          response.rows,
+          "workorderId",
+          "parentId"
+        );
         this.total = response.total;
         this.loading = false;
       });
@@ -531,15 +738,23 @@ export default {
       return {
         id: node.workorderId,
         label: node.workorderName,
-        children: node.children
+        children: node.children,
       };
     },
-	/** 查询生产工单下拉树结构 */
+    /** 查询生产工单下拉树结构 */
     getTreeselect() {
-      listWorkorder().then(response => {
+      listWorkorder().then((response) => {
         this.workorderOptions = [];
-        const data = { workorderId: 0, workorderName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "workorderId", "parentId");
+        const data = {
+          workorderId: 0,
+          workorderName: "顶级节点",
+          children: [],
+        };
+        data.children = this.handleTree(
+          response.data,
+          "workorderId",
+          "parentId"
+        );
         this.workorderOptions.push(data);
       });
     },
@@ -554,7 +769,7 @@ export default {
         workorderId: null,
         workorderCode: null,
         workorderName: null,
-        workorderType: 'SELF',
+        workorderType: "SELF",
         orderSource: null,
         sourceCode: null,
         productId: null,
@@ -579,9 +794,10 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        workpieceType: "1",
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -594,7 +810,7 @@ export default {
       this.handleQuery();
     },
     //从BOM行中直接新增
-    handleSubAdd(row){
+    handleSubAdd(row) {
       this.open = false;
       this.reset();
       this.getTreeselect();
@@ -608,7 +824,7 @@ export default {
       }
       this.open = true;
       this.title = "添加生产工单";
-      this.optType="add";
+      this.optType = "add";
     },
     /** 新增按钮操作 */
     handleAdd(row) {
@@ -626,14 +842,17 @@ export default {
       }
       this.open = true;
       this.title = "添加生产工单";
-      this.optType="add";
+      this.optType = "add";
+      genCode("WORKORDER_CODE").then((response) => {
+        this.form.workorderCode = response;
+      });
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
       this.getTreeselect();
       const workorderId = row.workorderId || this.ids;
-      getWorkorder(workorderId).then(response => {
+      getWorkorder(workorderId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "查看工单信息";
@@ -647,26 +866,27 @@ export default {
       if (row != null) {
         this.form.parentId = row.workorderId;
       }
-      getWorkorder(row.workorderId).then(response => {
+      getWorkorder(row.workorderId).then((response) => {
         this.form = response.data;
+        this.form.workorderType = "SELF";
         this.open = true;
         this.title = "修改生产工单";
-        this.optType="edit";
+        this.optType = "edit";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.workorderId != null) {
-            updateWorkorder(this.form).then(response => {
+            updateWorkorder(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               //this.open = false;
               this.$refs["bomlist"].getList();
               this.getList();
             });
           } else {
-            addWorkorder(this.form).then(response => {
+            addWorkorder(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               //this.open = false;
               this.form.workorderId = response.data;
@@ -678,82 +898,98 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除生产工单编号为"' + row.workorderId + '"的数据项？').then(function() {
-        return delWorkorder(row.workorderId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm(
+          '是否确认删除生产工单编码为"' + row.workorderCode + '"的数据项？'
+        )
+        .then(function () {
+          return delWorkorder(row.workorderId);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
-    handleSelectProduct(){
+    handleSelectProduct() {
       this.$refs.itemSelect.showFlag = true;
     },
-    handleSelectClient(){
+    handleSelectClient() {
       this.$refs.clientSelect.showFlag = true;
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/pro/workorder/export', {
-        ...this.queryParams
-      }, `workorder_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/pro/workorder/export",
+        {
+          ...this.queryParams,
+        },
+        `workorder_${new Date().getTime()}.xlsx`
+      );
     },
-    handleConfirm(){
+    handleConfirm() {
       let that = this;
-      this.$modal.confirm('是确认完成工单编制？【确认后将不能更改】').then(function(){
-        that.form.status = 'CONFIRMED';
-        that.submitForm();
-      });
+      this.$modal
+        .confirm("是否确认完成工单编制？【确认后将不能更改】")
+        .then(function () {
+          that.form.status = "PRODUCTION";
+          that.submitForm();
+        });
     },
-    handleFinish(row){
+    handleFinish(row) {
       const workorderIds = row.workorderId || this.ids;
-      this.$modal.confirm('确认完成工单？一旦完成，此工单将无法继续报工').then(function() {
-        return dofinish(workorderIds) //完成工单
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("更改成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("确认完成工单？一旦完成，此工单将无法继续报工")
+        .then(function () {
+          return dofinish(workorderIds); //完成工单
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("更改成功");
+        })
+        .catch(() => {});
     },
     //物料选择弹出框
-    onItemSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.productId = obj.itemId;
-          this.form.productCode = obj.itemCode;
-          this.form.productName = obj.itemName;
-          this.form.productSpc = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
-        }
+    onItemSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.productId = obj.itemId;
+        this.form.productCode = obj.itemCode;
+        this.form.productName = obj.itemName;
+        this.form.productSpc = obj.specification;
+        this.form.unitOfMeasure = obj.unitOfMeasure;
+      }
     },
     //客户选择弹出框
-    onClientSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.clientId = obj.clientId;
-          this.form.clientCode = obj.clientCode;
-          this.form.clientName = obj.clientName;
-        }
+    onClientSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.clientId = obj.clientId;
+        this.form.clientCode = obj.clientCode;
+        this.form.clientName = obj.clientName;
+      }
     },
     //供应商选择
-    handleSelectVendor(){
+    handleSelectVendor() {
       this.$refs.vendorSelect.showFlag = true;
     },
     //供应商选择弹出框
-    onVendorSelected(obj){
-        debugger;
-        if(obj != undefined && obj != null){
-          this.form.vendorId = obj.vendorId;
-          this.form.vendorCode = obj.vendorCode;
-          this.form.vendorName = obj.vendorName;
-        }
+    onVendorSelected(obj) {
+      debugger;
+      if (obj != undefined && obj != null) {
+        this.form.vendorId = obj.vendorId;
+        this.form.vendorCode = obj.vendorCode;
+        this.form.vendorName = obj.vendorName;
+      }
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('WORKORDER_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("WORKORDER_CODE").then((response) => {
           this.form.workorderCode = response;
         });
-      }else{
+      } else {
         this.form.workorderCode = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue
index 1bafe55..20cc643 100644
--- a/src/views/mes/qc/ipqc/index.vue
+++ b/src/views/mes/qc/ipqc/index.vue
@@ -394,7 +394,7 @@ export default {
   dicts: ['mes_ipqc_type','mes_qc_result','mes_order_status'],
   data() {
     return {
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -475,15 +475,6 @@ export default {
         quantityCheck: [
           { required: true, message: "检测数量不能为空", trigger: "blur" }
         ],
-
-        quantityUnqualified: [
-          { required: true, message: "不合格品数量不能为空", trigger: "blur" }
-        ],
-
-        quantityQualified: [
-          { required: true, message: "合格品数量不能为空", trigger: "blur" }
-        ]
-
       }
     };
   },
@@ -553,7 +544,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -578,6 +569,9 @@ export default {
       this.open = true;
       this.title = "添加过程检验单";
       this.optType = "add";
+        genCode('IPQC_CODE').then(response =>{
+          this.form.ipqcCode = response;
+        });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/mes/qc/iqc/iqc.vue b/src/views/mes/qc/iqc/iqc.vue
index 338cfd1..3c3509d 100644
--- a/src/views/mes/qc/iqc/iqc.vue
+++ b/src/views/mes/qc/iqc/iqc.vue
@@ -413,7 +413,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       acceptImg:  require('@/assets/images/accept.png'),
       rejectImg: require('@/assets/images/reject.png'),
@@ -563,7 +563,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -588,6 +588,9 @@ export default {
       this.open = true;
       this.title = "添加来料检验单";
       this.optType = 'add';
+        genCode('QC_IQC_CODE').then(response =>{
+          this.form.iqcCode = response;
+        });
     },
     //查看明细
     handleView(row){
@@ -709,7 +712,6 @@ export default {
         debugger;
         let blob = new Blob([res],{type:'application/pdf'});        
         let href = URL.createObjectURL(blob);
-        console.log(href);
         window.open(`/pdf/web/viewer.html?file=${encodeURIComponent(href)}`);
       });
     }
diff --git a/src/views/mes/qc/oqc/index.vue b/src/views/mes/qc/oqc/index.vue
index cafb3f1..f6e11d8 100644
--- a/src/views/mes/qc/oqc/index.vue
+++ b/src/views/mes/qc/oqc/index.vue
@@ -388,7 +388,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -531,7 +531,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -567,6 +567,9 @@ export default {
       this.open = true;
       this.title = "添加出货检验单";
       this.optType = "add";
+        genCode('OQC_CODE').then(response =>{
+          this.form.oqcCode = response;
+        });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue
index b363fee..de37a37 100644
--- a/src/views/mes/qc/pendinginspect/index.vue
+++ b/src/views/mes/qc/pendinginspect/index.vue
@@ -95,7 +95,7 @@
     data() {
       return {
         //自动生成编码
-        autoGenFlag:false,
+        autoGenFlag:true,
         optType: undefined,
         // 遮罩层
         loading: true,
diff --git a/src/views/mes/qc/pendinginspect/iqc.vue b/src/views/mes/qc/pendinginspect/iqc.vue
index 9dc9b36..4673d6b 100644
--- a/src/views/mes/qc/pendinginspect/iqc.vue
+++ b/src/views/mes/qc/pendinginspect/iqc.vue
@@ -286,7 +286,7 @@ export default {
           updateBy: null,
           updateTime: null
         };
-        this.autoGenFlag = false;
+        this.autoGenFlag = true;
         this.resetForm("form");
       },
       /** 提交按钮 */
diff --git a/src/views/mes/qc/pendinginspect/oqc.vue b/src/views/mes/qc/pendinginspect/oqc.vue
index 4b0203d..7937771 100644
--- a/src/views/mes/qc/pendinginspect/oqc.vue
+++ b/src/views/mes/qc/pendinginspect/oqc.vue
@@ -196,7 +196,7 @@ export default {
   data(){
     return {
         //自动生成编码
-        autoGenFlag:false,
+        autoGenFlag:true,
         optType: undefined,
         // 表单参数
       form: {},
@@ -277,7 +277,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 提交按钮 */
diff --git a/src/views/mes/qc/pendinginspect/pqc.vue b/src/views/mes/qc/pendinginspect/pqc.vue
index aa96f6d..81c50a1 100644
--- a/src/views/mes/qc/pendinginspect/pqc.vue
+++ b/src/views/mes/qc/pendinginspect/pqc.vue
@@ -320,7 +320,7 @@ export default {
                 updateBy: null,
                 updateTime: null
             };
-            this.autoGenFlag = false;
+            this.autoGenFlag = true;
             this.resetForm("form");
         },
         /** 提交按钮 */
diff --git a/src/views/mes/qc/qcindex/index.vue b/src/views/mes/qc/qcindex/index.vue
index b0db0d3..26e68f8 100644
--- a/src/views/mes/qc/qcindex/index.vue
+++ b/src/views/mes/qc/qcindex/index.vue
@@ -186,7 +186,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -267,7 +267,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -292,6 +292,9 @@ export default {
       this.open = true;
       this.title = "添加检测项";
       this.optType = "add";
+        genCode('QC_INDEX_CODE').then(response =>{
+          this.form.indexCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/qc/qctemplate/index.vue b/src/views/mes/qc/qctemplate/index.vue
index 2345e29..dd0faf7 100644
--- a/src/views/mes/qc/qctemplate/index.vue
+++ b/src/views/mes/qc/qctemplate/index.vue
@@ -225,7 +225,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -305,7 +305,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -330,6 +330,9 @@ export default {
       this.open = true;
       this.title = "添加检测模板";
       this.optType = "add";
+        genCode('QC_TEMPLATE_CODE').then(response =>{
+          this.form.templateCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/tm/tool/index.vue b/src/views/mes/tm/tool/index.vue
index d0a8354..ff75532 100644
--- a/src/views/mes/tm/tool/index.vue
+++ b/src/views/mes/tm/tool/index.vue
@@ -313,7 +313,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -415,7 +415,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     onToolTypeChanged(){
@@ -460,6 +460,9 @@ export default {
       this.open = true;
       this.title = "添加工装夹具清单";
       this.optType = "add";
+        genCode('TOOL_CODE').then(response =>{
+          this.form.toolCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/tm/tooltype/index.vue b/src/views/mes/tm/tooltype/index.vue
index f13b923..7026e19 100644
--- a/src/views/mes/tm/tooltype/index.vue
+++ b/src/views/mes/tm/tooltype/index.vue
@@ -223,7 +223,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -302,7 +302,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -327,6 +327,9 @@ export default {
       this.open = true;
       this.title = "添加工装夹具类型";
       this.optType = "add";
+        genCode('TOOL_TYPE_CODE').then(response =>{
+          this.form.toolTypeCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/wm/area/index.vue b/src/views/mes/wm/area/index.vue
index 39a6282..f2176e7 100644
--- a/src/views/mes/wm/area/index.vue
+++ b/src/views/mes/wm/area/index.vue
@@ -253,7 +253,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       locationId: undefined,
       // 遮罩层
@@ -345,7 +345,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -370,6 +370,9 @@ export default {
       this.open = true;
       this.title = "添加库位";
       this.optType = "add";
+        genCode('AREA_CODE').then(response =>{
+          this.form.areaCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/wm/barcode/index.vue b/src/views/mes/wm/barcode/index.vue
index 231e141..5786a9b 100644
--- a/src/views/mes/wm/barcode/index.vue
+++ b/src/views/mes/wm/barcode/index.vue
@@ -201,27 +201,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--仓库-->
-        <el-row v-if="form.barcodeType=='WAREHOUSE'">
-          <el-col :span="24">
-            <el-form-item label="储位" prop="warehouseId">
-              <!-- <el-cascader v-model="warehouseInfo"
-                :options="warehouseOptions"
-                :props="warehouseProps"
-                @change="handleWarehouseChanged"
-              >                  
-              </el-cascader> -->
-              <el-cascader v-model="warehouseInfo"
-                ref="warehouseRef"
-                :options="warehouseOptions"
-                :props="warehouseProps"
-                @change="handleWarehouseChanged"
-              >                  
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         <!--箱条码-->
         <el-row v-if="form.barcodeType=='BOX'">
           <el-col :span="12">
@@ -255,7 +234,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- 工作站 -->
         <el-row v-else-if="form.barcodeType=='WORKSTATION'">
           <el-col :span="12">
             <el-form-item label="工作站" prop="bussinessCode">
@@ -272,23 +250,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- 库存 -->
-        <el-row v-else-if="form.barcodeType=='STOCK'">
-          <el-col :span="8">
-            <el-form-item label="物资编码" prop="bussinessCode">
-              <el-input v-model="form.bussinessCode" placeholder="请选择库存记录" >
-                <el-button slot="append" icon="el-icon-search" @click="handleMaterialStockSelect"></el-button>
-              </el-input>
-            </el-form-item>
-            <StockSelect ref="stockSelect"  @onSelected="onMaterialStockSelected"> </StockSelect>      
-          </el-col>
-          <el-col :span="16">
-            <el-form-item label="物资信息" prop="bussinessName">
-              <el-input v-model="form.bussinessName" readonly="readonly" ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         <!--根据不同的条码类型展示不同的业务内容选择 end-->
         <el-row>
           <el-col :span="24">
@@ -331,25 +292,16 @@ import ItemSelect  from "@/components/itemSelect/single.vue";
 import VendorSelect from "@/components/vendorSelect/single.vue";
 import PackageSelectSingle from "@/components/package/single.vue";
 import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
-import StockSelect from "@/components/stockSelect/single.vue"
 import Barcodeconfig from "./config.vue"
 import BarcodeBatchPrint from "./batchprint.vue"
-import {getTreeList} from "@/api/mes/wm/warehouse"
 export default {
   name: "Barcode",
   dicts: ['mes_barcode_type','mes_barcode_formart','sys_yes_no'],
   components: {
-    ItemSelect,VendorSelect,PackageSelectSingle,Barcodeconfig,WorkstationSelect,StockSelect,BarcodeBatchPrint
+    ItemSelect,VendorSelect,PackageSelectSingle,Barcodeconfig,WorkstationSelect,BarcodeBatchPrint
   },
   data() {
     return {
-      warehouseInfo:[],
-      warehouseOptions:[],
-      warehouseProps:{
-        multiple: false,
-        value: 'pId',
-        label: 'pName',
-      },
       optType: null,
       // 遮罩层
       loading: true,
@@ -400,7 +352,6 @@ export default {
   },
   created() {
     this.getList();
-    this.getWarehouseList();
   },
   methods: {
     /** 查询条码清单列表 */
@@ -534,40 +485,6 @@ export default {
           this.form.barcodeContent= "".concat(this.form.barcodeType,'-',this.form.bussinessCode);
         }
     },
-    //选择仓库、库区、库位
-    getWarehouseList(){
-      getTreeList().then( response =>{        
-        if(response.data){
-          this.warehouseOptions = response.data.filter((el) =>{
-              return el.warehouseCode.indexOf('VIR') == -1;
-          });;
-        }
-        this.warehouseOptions.map(w =>{
-          debugger;
-          w.children.map(l =>{
-                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');                  
-                  l.children = JSON.parse(lstr);
-          });
-            
-          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');  
-          w.children =  JSON.parse(wstr); 
-
-        });
-        let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
-        this.warehouseOptions = JSON.parse(ostr);
-        debugger;
-      });
-    },
-    handleWarehouseChanged(obj){
-      debugger;
-      const checkedNode = this.$refs['warehouseRef'].getCheckedNodes();
-      if(obj !=null){
-        this.form.bussinessId = checkedNode[0].data.pId;
-        this.form.bussinessCode = checkedNode[0].data.areaCode;
-        this.form.bussinessName = checkedNode[0].data.pName;
-        this.form.barcodeContent = "".concat(this.form.barcodeType,'-',this.form.bussinessCode);
-      }
-    },
     //装箱单选择
     handleSelectPackage(){
       this.$refs.packageSelect.showFlag=true;
@@ -594,22 +511,6 @@ export default {
           this.form.barcodeContent= "".concat(this.form.barcodeType,'-',this.form.bussinessCode);
         }
     },
-    /**
-     * 选择库存 
-     */
-     handleMaterialStockSelect(){
-        this.$refs.stockSelect.showFlag = true;
-     },
-
-     /**库存选择返回 */
-     onMaterialStockSelected(obj){
-      if(obj != undefined && obj != null){
-          this.form.bussinessId = obj.materialStockId;
-          this.form.bussinessCode = obj.itemCode;
-          this.form.bussinessName = "".concat(obj.itemName,'|',obj.specification,'|',obj.vendorName,'|',obj.batchCode);
-          this.form.barcodeContent= "".concat(this.form.barcodeType,'-',this.form.bussinessId);
-        }
-     },
     handleConfig(){
       this.$refs.barcodeconfig.showFlag = true;
     },
diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue
index 9c4e229..2b60e92 100644
--- a/src/views/mes/wm/issue/index.vue
+++ b/src/views/mes/wm/issue/index.vue
@@ -272,7 +272,7 @@ export default {
   components: {Issueline,WorkstationSelect,WorkorderSelect},
   data() {
     return {
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       warehouseInfo:[],
       warehouseOptions:[],
@@ -420,7 +420,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;  
+      this.autoGenFlag = true;  
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -445,6 +445,9 @@ export default {
       this.open = true;
       this.title = "添加生产领料单";
       this.optType = "add";
+        genCode('ISSUE_CODE').then(response =>{
+          this.form.issueCode = response;
+        });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/mes/wm/issue/line.vue b/src/views/mes/wm/issue/line.vue
index 944fd1b..03dcaaa 100644
--- a/src/views/mes/wm/issue/line.vue
+++ b/src/views/mes/wm/issue/line.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">    
+  <div class="app-container">
     <el-row v-if="optType != 'view'" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -9,7 +9,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:wm:issueheader:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -20,7 +21,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:wm:issueheader:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -31,24 +33,59 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:wm:issueheader:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="issuelineList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="issuelineList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
-      <el-table-column label="产品物料名称" width="120px"  align="center" prop="itemName" :show-overflow-tooltip="true"/>
-      <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="产品物料编码"
+        width="120px"
+        align="center"
+        prop="itemCode"
+      />
+      <el-table-column
+        label="产品物料名称"
+        width="120px"
+        align="center"
+        prop="itemName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="specification"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="领料数量" align="center" prop="quantityIssued" />
       <el-table-column label="批次号" align="center" prop="batchCode" />
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
       <el-table-column label="库区名称" align="center" prop="locationName" />
       <el-table-column label="库位名称" align="center" prop="areaName" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" v-if="optType != 'view'" width="100px" class-name="small-padding fixed-width">
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        v-if="optType != 'view'"
+        width="100px"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -57,7 +94,8 @@
             @click="handleUpdate(scope.row)"
             v-if="optType != 'view'"
             v-hasPermi="['mes:wm:issueheader:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -65,13 +103,14 @@
             @click="handleDelete(scope.row)"
             v-if="optType != 'view'"
             v-hasPermi="['mes:wm:issueheader:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -80,72 +119,91 @@
 
     <!-- 添加或修改生产领料单行对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
-            <el-col :span="8">
-                <el-form-item label="产品物料编码" prop="itemCode">
-                    <el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择产品物料编码" >
-                      <el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
-                    </el-input>
-                </el-form-item>
-                <StockSelect ref="stockSelect" :batchCode="form.batchCode" :vendorId="form.vendorId" @onSelected="onStockSelected"></StockSelect>
-            </el-col>
-            <el-col :span="8">
-                <el-form-item label="产品物料名称" prop="itemName">
-                    <el-input v-model="form.itemName" readonly="readonly" />
-                </el-form-item>
-            </el-col>
+          <el-col :span="8">
+            <el-form-item label="产品物料编码" prop="itemCode">
+              <el-input
+                v-model="form.itemCode"
+                readonly="readonly"
+                placeholder="请选择产品物料编码"
+              >
+                <el-button
+                  slot="append"
+                  @click="handleSelectStock"
+                  icon="el-icon-search"
+                ></el-button>
+              </el-input>
+            </el-form-item>
+            <StockSelect
+              ref="stockSelect"
+              :batchCode="batchCdoe"
+              :vendorId="vendorId"
+              @onSelected="onStockSelected"
+            ></StockSelect>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="产品物料名称" prop="itemName">
+              <el-input v-model="form.itemName" readonly="readonly" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="领料数量" prop="quantityIssued">
-              <el-input-number :max="form.quantityMax" v-model="form.quantityIssued" placeholder="请输入领料数量" />
+              <el-input-number
+                :max="form.quantityMax"
+                v-model="form.quantityIssued"
+                placeholder="请输入领料数量"
+              />
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
-            <el-col :span="24">
-                <el-form-item label="规格型号" prop="specification">
-                    <el-input v-model="form.specification" readonly="readonly" type="textarea" />
-                </el-form-item>
-            </el-col>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="规格型号" prop="specification">
+              <el-input
+                v-model="form.specification"
+                readonly="readonly"
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-            <el-col :span="8">
-              <el-form-item label="单位" prop="unitOfMeasure">
-                <el-input v-model="form.unitOfMeasure" readonly="readonly" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="批次号" prop="batchCode">
-                <el-input v-model="form.batchCode" readonly="readonly" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-
-            </el-col>
+          <el-col :span="8">
+            <el-form-item label="单位" prop="unitOfMeasure">
+              <el-input v-model="form.unitOfMeasure" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="批次号" prop="batchCode">
+              <el-input v-model="form.batchCode" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"> </el-col>
         </el-row>
         <el-row>
-            <el-col :span="8">
-              <el-form-item label="仓库" prop="warehouseName">
-                <el-input v-model="form.warehouseName" readonly="readonly" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="库区" prop="locationName">
-                <el-input v-model="form.locationName" readonly="readonly" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="库位" prop="areaName">
-                <el-input v-model="form.areaName" readonly="readonly" />
-              </el-form-item>
-            </el-col>
+          <el-col :span="8">
+            <el-form-item label="仓库" prop="warehouseName">
+              <el-input v-model="form.warehouseName" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="库区" prop="locationName">
+              <el-input v-model="form.locationName" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="库位" prop="areaName">
+              <el-input v-model="form.areaName" readonly="readonly" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="remark">
-                <el-input v-model="form.remark" type="textarea" />
-              </el-form-item>
-            </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -157,17 +215,23 @@
 </template>
 
 <script>
-import { listIssueline, getIssueline, delIssueline, addIssueline, updateIssueline } from "@/api/mes/wm/issueline";
-import StockSelect from "@/components/stockSelect/single.vue"
+import {
+  listIssueline,
+  getIssueline,
+  delIssueline,
+  addIssueline,
+  updateIssueline,
+} from "@/api/mes/wm/issueline";
+import StockSelect from "@/components/stockSelect/single.vue";
 export default {
   name: "Issueline",
-  components:{StockSelect},
-    props:{
+  components: { StockSelect },
+  props: {
     optType: null,
     issueId: null,
     warehouseId: null,
     locationId: null,
-    areaId: null
+    areaId: null,
   },
   data() {
     return {
@@ -216,12 +280,15 @@ export default {
       // 表单校验
       rules: {
         itemId: [
-          { required: true, message: "产品物料不能为空", trigger: "blur" }
+          { required: true, message: "产品物料不能为空", trigger: "blur" },
         ],
         quantityIssued: [
-          { required: true, message: "领料数量不能为空", trigger: "blur" }
+          { required: true, message: "领料数量不能为空", trigger: "blur" },
         ],
-      }
+        itemCode: [
+          { required: true, message: "产品物料编码不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -231,7 +298,7 @@ export default {
     /** 查询生产领料单行列表 */
     getList() {
       this.loading = true;
-      listIssueline(this.queryParams).then(response => {
+      listIssueline(this.queryParams).then((response) => {
         this.issuelineList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -271,7 +338,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -287,9 +354,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.lineId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.lineId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -300,26 +367,28 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const lineId = row.lineId || this.ids
-      getIssueline(lineId).then(response => {
-        debugger;
+      const lineId = row.lineId || this.ids;
+      getIssueline(lineId).then((response) => {
         this.form = response.data;
+        this.warehouseInfo[0] = response.data.warehouseId;
+        this.warehouseInfo[1] = response.data.locationId;
+        this.warehouseInfo[2] = response.data.areaId;
         this.open = true;
         this.title = "修改生产领料单行";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.lineId != null) {
-            updateIssueline(this.form).then(response => {
+            updateIssueline(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addIssueline(this.form).then(response => {
+            addIssueline(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -331,46 +400,54 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const lineIds = row.lineId || this.ids;
-      this.$modal.confirm('是否确认删除生产领料单行编号为"' + lineIds + '"的数据项？').then(function() {
-        return delIssueline(lineIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除生产领料单行编号为"' + lineIds + '"的数据项？')
+        .then(function () {
+          return delIssueline(lineIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
-    handleSelectStock(){
+    handleSelectStock() {
       this.$refs.stockSelect.showFlag = true;
       this.$refs.stockSelect.getList();
     },
-        //物料选择弹出框
-    onStockSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.materialStockId = obj.materialStockId;
-          this.form.itemId = obj.itemId;
-          this.form.itemCode = obj.itemCode;
-          this.form.itemName = obj.itemName;
-          this.form.specification = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
-          this.form.batchCode = obj.batchCode;
-          this.form.warehouseId = obj.warehouseId;
-          this.form.warehouseCode = obj.warehouseCode;
-          this.form.warehouseName = obj.warehouseName;
-          this.form.locationId = obj.locationId;
-          this.form.locationCode = obj.locationCode;
-          this.form.locationName = obj.locationName;
-          this.form.areaId = obj.areaId;
-          this.form.areaCode = obj.areaCode;
-          this.form.areaName = obj.areaName;
-          this.form.quantityIssued = obj.quantityOnhand;
-          this.form.quantityMax = obj.quantityOnhand;
-        }
+    //物料选择弹出框
+    onStockSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.materialStockId = obj.materialStockId;
+        this.form.itemId = obj.itemId;
+        this.form.itemCode = obj.itemCode;
+        this.form.itemName = obj.itemName;
+        this.form.specification = obj.specification;
+        this.form.unitOfMeasure = obj.unitOfMeasure;
+        this.form.batchCode = obj.batchCode;
+        this.form.warehouseId = obj.warehouseId;
+        this.form.warehouseCode = obj.warehouseCode;
+        this.form.warehouseName = obj.warehouseName;
+        this.form.locationId = obj.locationId;
+        this.form.locationCode = obj.locationCode;
+        this.form.locationName = obj.locationName;
+        this.form.areaId = obj.areaId;
+        this.form.areaCode = obj.areaCode;
+        this.form.areaName = obj.areaName;
+        this.form.quantityIssued = obj.quantityOnhand;
+        this.form.quantityMax = obj.quantityOnhand;
+      }
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('wm/issueline/export', {
-        ...this.queryParams
-      }, `issueline_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "wm/issueline/export",
+        {
+          ...this.queryParams,
+        },
+        `issueline_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index 2a9663c..f7e0b4b 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="入库单编号" prop="recptCode">
         <el-input
           v-model="queryParams.recptCode"
@@ -34,16 +41,26 @@
         />
       </el-form-item>
       <el-form-item label="入库日期" prop="recptDate">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.recptDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择入库日期">
+          placeholder="请选择入库日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -56,7 +73,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:wm:itemrecpt:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,7 +85,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:wm:itemrecpt:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -78,7 +97,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:wm:itemrecpt:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,67 +108,112 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:wm:itemrecpt:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="itemrecptList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />      
-      <el-table-column label="入库单编号" align="center" width="180px" prop="recptCode" >
+    <el-table
+      v-loading="loading"
+      :data="itemrecptList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="入库单编号"
+        align="center"
+        width="180px"
+        prop="recptCode"
+      >
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:query']"
-          >{{scope.row.recptCode}}</el-button>
+            >{{ scope.row.recptCode }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column label="入库单名称" align="center" prop="recptName" :show-overflow-tooltip="true"/>
-      <el-table-column label="供应商名称" align="center" prop="vendorName" :show-overflow-tooltip="true"/>      
-      <el-table-column label="入库日期" align="center" prop="recptDate" width="180">
+      <el-table-column
+        label="入库单名称"
+        align="center"
+        prop="recptName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="供应商名称"
+        align="center"
+        prop="vendorName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="入库日期"
+        align="center"
+        prop="recptDate"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.recptDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.recptDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="采购订单号" align="center" prop="poCode" />
-      <el-table-column label="单据状态" align="center" prop="status" >
+      <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.mes_order_status"
+            :value="scope.row.status"
+          />
         </template>
-      </el-table-column>      
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="
+              scope.row.status == 'PREPARE' || scope.row.status == 'WAREHOUSING'
+            "
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:edit']"
-          >执行入库</el-button>
+            >执行入库</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="
+              scope.row.status == 'PREPARE' || scope.row.status == 'WAREHOUSING'
+            "
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
+            v-if="
+              scope.row.status == 'PREPARE' || scope.row.status == 'WAREHOUSING'
+            "
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:wm:itemrecpt:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -156,37 +221,53 @@
     />
 
     <!-- 添加或修改物料入库单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="入库单编号" prop="recptCode">
-              <el-input v-model="form.recptCode" placeholder="请输入入库单编号" />
+              <el-input
+                v-model="form.recptCode"
+                placeholder="请输入入库单编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">               
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view' && form.status == 'PREPARE'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="入库单名称" prop="recptName">
-              <el-input v-model="form.recptName" placeholder="请输入入库单名称" />
+              <el-input
+                v-model="form.recptName"
+                placeholder="请输入入库单名称"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">            
+          <el-col :span="8">
             <el-form-item label="入库日期" prop="recptDate">
-              <el-date-picker clearable
+              <el-date-picker
+                clearable
                 v-model="form.recptDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择入库日期">
+                placeholder="请选择入库日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -197,7 +278,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="单据状态" prop="status">
-              <el-select v-model="form.status" disabled placeholder="请选择单据状态">
+              <el-select
+                v-model="form.status"
+                disabled
+                placeholder="请选择单据状态"
+              >
                 <el-option
                   v-for="dict in dict.type.mes_order_status"
                   :key="dict.value"
@@ -211,69 +296,182 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="供应商" prop="vendorName">
-              <el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" >
-                <el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
+              <el-input
+                v-model="form.vendorName"
+                readonly="readonly"
+                placeholder="请选择供应商"
+              >
+                <el-button
+                  slot="append"
+                  @click="handleSelectVendor"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
               <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="入库仓库">
-              <el-cascader v-model="warehouseInfo"
+              <el-cascader
+                v-model="warehouseInfo"
                 :options="warehouseOptions"
                 :props="warehouseProps"
                 @change="handleWarehouseChanged"
-              >                  
+              >
               </el-cascader>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-
-          </el-col>
-        </el-row>               
+          </el-col> -->
+          <el-col :span="8"> </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider> 
-        <el-card shadow="always" v-if="form.recptId !=null" class="box-card">
-          <Itemrecptline ref=line :recptId="form.recptId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Itemrecptline>
-        </el-card>
+      <el-divider v-if="form.recptId != null" content-position="center"
+        >物料信息</el-divider
+      >
+      <el-card shadow="always" v-if="form.recptId != null" class="box-card">
+        <Itemrecptline
+          ref="line"
+          :recptId="form.recptId"
+          :warehouseId="form.warehouseId"
+          :locationId="form.locationId"
+          :areaId="form.areaId"
+          :optType="optType"
+        ></Itemrecptline>
+      </el-card>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>        
+        <el-button
+          type="primary"
+          @click="cancel"
+          v-if="optType == 'view' || form.status != 'PREPARE'"
+          >返回</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
+          >保 存</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 执行入库对话框 -->
+    <el-dialog
+      title="执行入库"
+      :visible.sync="warehousing"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="perform"
+        :model="perform"
+        :rules="rules"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="物料编码" prop="itemId">
+              <el-select
+                style="width: 80%"
+                v-model="perform.itemCode"
+                placeholder="请选择物料编码"
+                @change="selectEncoding"
+              >
+                <el-option
+                  v-for="dict in itemrecptlineList"
+                  :key="dict.lineId"
+                  :label="dict.itemCode"
+                  :value="dict"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="选择托盘" prop="palletId">
+              <el-select
+                style="width: 80%"
+                v-model="perform.palletCode"
+                placeholder="请选择选择托盘"
+                @change="selectTray"
+              >
+                <el-option
+                  v-for="dict in itemList"
+                  :key="dict.proPalletId"
+                  :label="dict.palletCode"
+                  :value="dict"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="剩余数量" prop=""
+              >{{ this.remainingquantity }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="warehousing = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listItemrecpt, getItemrecpt, delItemrecpt, addItemrecpt, updateItemrecpt, confirmItemrecpt,execute } from "@/api/mes/wm/itemrecpt";
-import {getTreeList} from "@/api/mes/wm/warehouse"
-import {genCode} from "@/api/system/autocode/rule"
+import axios from "axios";
+import {
+  listItemrecpt,
+  getItemrecpt,
+  delItemrecpt,
+  addItemrecpt,
+  updateItemrecpt,
+  confirmItemrecpt,
+} from "@/api/mes/wm/itemrecpt";
+import { listItemrecptline } from "@/api/mes/wm/itemrecptline";
+import { listMdItem } from "@/api/mes/md/pallet";
+
+import { getTreeList } from "@/api/mes/wm/warehouse";
+import { genCode } from "@/api/system/autocode/rule";
 import VendorSelect from "@/components/vendorSelect/single.vue";
 import IqcSelect from "@/components/iqcSelect/single.vue";
 import Itemrecptline from "./line.vue";
 export default {
   name: "Itemrecpt",
-  dicts:['mes_order_status'],
-  components :{VendorSelect,IqcSelect,Itemrecptline},
+  dicts: ["mes_order_status"],
+  components: {
+    VendorSelect,
+    IqcSelect,
+    Itemrecptline,
+    listItemrecptline,
+    listMdItem,
+  },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: true,
       optType: undefined,
-      warehouseInfo:[],
-      warehouseOptions:[],
-      warehouseProps:{
+      warehouseInfo: [],
+      warehouseOptions: [],
+      warehouseProps: {
         multiple: false,
-        value: 'pId',
-        label: 'pName',
+        value: "pId",
+        label: "pName",
       },
       // 遮罩层
       loading: true,
@@ -293,6 +491,14 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示弹出层
+      warehousing: false,
+      itemrecptlineList: [],
+      itemList: [],
+      perform: {},
+      remainingquantity: 0,
+      recptIdsData: "",
+      itemData: "",
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -320,21 +526,27 @@ export default {
       },
       // 表单参数
       form: {},
+      arrquantityRecived: "",
+      arraccepted: "",
       // 表单校验
       rules: {
         recptCode: [
-          { required: true, message: "入库单编号不能为空", trigger: "blur" }
+          { required: true, message: "入库单编号不能为空", trigger: "blur" },
         ],
         recptName: [
-          { required: true, message: "入库单名称不能为空", trigger: "blur" }
+          { required: true, message: "入库单名称不能为空", trigger: "blur" },
         ],
         recptDate: [
-          { required: true, message: "入库时间不能为空", trigger: "blur"}
+          { required: true, message: "入库时间不能为空", trigger: "blur" },
         ],
         vendorName: [
-          { required: true, message: "请选择对应的供应商", trigger: "blur"}
-        ]
-      }
+          { required: true, message: "请选择对应的供应商", trigger: "blur" },
+        ],
+        itemId: [
+          { required: true, message: "请选择物料编码", trigger: "blur" },
+        ],
+        palletId: [{ required: true, message: "请选择托盘", trigger: "blur" }],
+      },
     };
   },
   created() {
@@ -345,30 +557,37 @@ export default {
     /** 查询物料入库单列表 */
     getList() {
       this.loading = true;
-      listItemrecpt(this.queryParams).then(response => {
+      listItemrecpt(this.queryParams).then((response) => {
         this.itemrecptList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    getWarehouseList(){
-      getTreeList().then( response =>{        
-        if(response.data){
-          this.warehouseOptions = response.data.filter((el) =>{
-              return el.warehouseCode.indexOf('VIR') == -1;
-          });;
-        }
-        this.warehouseOptions.map(w =>{
-          w.children.map(l =>{
-                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');                  
-                  l.children = JSON.parse(lstr);
+    getWarehouseList() {
+      getTreeList().then((response) => {
+        if (response.data) {
+          this.warehouseOptions = response.data.filter((el) => {
+            return el.warehouseCode.indexOf("VIR") == -1;
+          });
+        }
+        this.warehouseOptions.map((w) => {
+          w.children.map((l) => {
+            let lstr = JSON.stringify(l.children)
+              .replace(/locationId/g, "lId")
+              .replace(/areaId/g, "pId")
+              .replace(/areaName/g, "pName");
+            l.children = JSON.parse(lstr);
           });
-            
-          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');  
-          w.children =  JSON.parse(wstr); 
 
+          let wstr = JSON.stringify(w.children)
+            .replace(/warehouseId/g, "wId")
+            .replace(/locationId/g, "pId")
+            .replace(/locationName/g, "pName");
+          w.children = JSON.parse(wstr);
         });
-        let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
+        let ostr = JSON.stringify(this.warehouseOptions)
+          .replace(/warehouseId/g, "pId")
+          .replace(/warehouseName/g, "pName");
         this.warehouseOptions = JSON.parse(ostr);
       });
     },
@@ -405,9 +624,9 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
-      this.autoGenFlag = false;      
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -422,9 +641,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.recptId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.recptId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -433,16 +652,19 @@ export default {
       this.open = true;
       this.title = "添加物料入库单";
       this.optType = "add";
+      genCode("ITEMRECPT_CODE").then((response) => {
+        this.form.recptCode = response;
+      });
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
-      const recptIds = row.recptId
-      getItemrecpt(recptIds).then(response => {
+      const recptIds = row.recptId;
+      getItemrecpt(recptIds).then((response) => {
         this.form = response.data;
-        this.warehouseInfo[0] = response.data.warehouseId;    
-        this.warehouseInfo[1] = response.data.locationId;    
-        this.warehouseInfo[2] = response.data.areaId; 
+        this.warehouseInfo[0] = response.data.warehouseId;
+        this.warehouseInfo[1] = response.data.locationId;
+        this.warehouseInfo[2] = response.data.areaId;
         this.open = true;
         this.title = "查看入库单信息";
         this.optType = "view";
@@ -451,40 +673,98 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const recptId = row.recptId || this.ids
-      getItemrecpt(recptId).then(response => {
-        this.form = response.data;   
-        this.warehouseInfo[0] = response.data.warehouseId;    
-        this.warehouseInfo[1] = response.data.locationId;    
-        this.warehouseInfo[2] = response.data.areaId;    
+      const recptId = row.recptId || this.ids;
+      getItemrecpt(recptId).then((response) => {
+        this.form = response.data;
+        this.warehouseInfo[0] = response.data.warehouseId;
+        this.warehouseInfo[1] = response.data.locationId;
+        this.warehouseInfo[2] = response.data.areaId;
         this.open = true;
         this.title = "修改物料入库单";
         this.optType = "edit";
       });
     },
-    
+
     //执行入库
-    handleExecute(row){
-      const recptIds = row.recptId || this.ids;
-      this.$modal.confirm('确认执行入库？').then(function() {
-        return execute(recptIds)//执行入库
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("入库成功");
-      }).catch(() => {});
+    handleExecute(row) {
+      this.remainingquantity = 0;
+      this.recptIdsData = row.recptId;
+      this.perform.recptId = row.recptId;
+      this.warehousing = true;
+      // 物料查询
+      listItemrecptline({ recptId: row.recptId }).then((response) => {
+        this.itemrecptlineList = response.rows;
+        response.rows.forEach((item) => {
+          var arr = 0;
+          this.arrquantityRecived = arr + item.quantityRecived;
+        });
+        response.rows.forEach((item) => {
+          var arr1 = 0;
+          this.arraccepted = arr1 + item.accepted;
+        });
+        this.remainingquantity = this.arrquantityRecived - this.arraccepted;
+      });
+      var queryParams = {
+        pageNum: 1,
+        pageSize: 10000,
+        status: 0,
+      };
+      // 托盘查询
+      listMdItem(queryParams).then((response) => {
+        this.itemList = response.rows;
+      });
+    },
+    selectEncoding(data) {
+      var arr = data.quantityRecived - data.accepted;
+      if (arr != 0) {
+        this.remainingquantity = arr;
+      } else {
+        this.remainingquantity = 0;
+      }
+      this.perform.itemCode = data.itemCode;
+      this.perform.lineId = data.lineId;
+    },
+    selectTray(data) {
+      this.perform.palletId = data.proPalletId;
+      this.perform.palletCode = data.palletCode;
+    },
+    submitFileForm() {
+      if (this.remainingquantity != 0) {
+        axios
+          // .get("http://192.168.2.104:8077/manage/matter/storageItem", {
+          .post(
+            "http://192.168.2.104:8077/manage/matter/storageItem",
+            this.perform
+          )
+          .then(function (res) {
+            if (res.data.code === 200) {
+              this.$modal.msgSuccess("入库成功");
+              this.warehousing = false;
+              this.getList();
+              this.selectEncoding();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
+      } else {
+        this.$message({
+          message: "当前入库数量为0",
+          type: "warning",
+        });
+      }
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.recptId != null) {
-            updateItemrecpt(this.form).then(response => {
+            updateItemrecpt(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addItemrecpt(this.form).then(response => {
+            addItemrecpt(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -493,79 +773,89 @@ export default {
         }
       });
     },
-    doconfirm(){
+    doconfirm() {
       let that = this;
-      this.$modal.confirm('是否完成入库单编制？【完成后将不能更改】').then(function(){
-        that.form.status = 'CONFIRMED';
-        that.submitForm();
-      });
+      this.$modal
+        .confirm("是否完成入库单编制？【完成后将不能更改】")
+        .then(function () {
+          that.form.status = "CONFIRMED";
+          that.submitForm();
+        });
     },
 
     /** 删除按钮操作 */
     handleDelete(row) {
       const recptIds = row.recptId || this.ids;
-      this.$modal.confirm('是否确认删除物料入库单？').then(function() {
-        return delItemrecpt(recptIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除物料入库单？")
+        .then(function () {
+          return delItemrecpt(recptIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('mes/wm/itemrecpt/export', {
-        ...this.queryParams
-      }, `itemrecpt_${new Date().getTime()}.xlsx`)
+      this.download(
+        "mes/wm/itemrecpt/export",
+        {
+          ...this.queryParams,
+        },
+        `itemrecpt_${new Date().getTime()}.xlsx`
+      );
     },
     //选择默认的仓库、库区、库位
-    handleWarehouseChanged(obj){
+    handleWarehouseChanged(obj) {
       debugger;
-      if(obj !=null){
+      if (obj != null) {
         this.form.warehouseId = obj[0];
         this.form.locationId = obj[1];
         this.form.areaId = obj[2];
       }
     },
     //IQC检验单选择
-    handleSelectIqc(){
+    handleSelectIqc() {
       this.$refs.iqcSelect.showFlag = true;
     },
     //IQC检验单选择弹出框
-    onIqcSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.iqcId = obj.iqcId;
-          this.form.iqcCode = obj.iqcCode;
-          this.form.recptName = obj.iqcName;
-          this.form.vendorId = obj.vendorId;
-          this.form.vendorCode = obj.vendorCode;
-          this.form.vendorName = obj.vendorName;
-          this.form.vendorNick = obj.vendorNick;
-        }
+    onIqcSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.iqcId = obj.iqcId;
+        this.form.iqcCode = obj.iqcCode;
+        this.form.recptName = obj.iqcName;
+        this.form.vendorId = obj.vendorId;
+        this.form.vendorCode = obj.vendorCode;
+        this.form.vendorName = obj.vendorName;
+        this.form.vendorNick = obj.vendorNick;
+      }
     },
     //供应商选择
-    handleSelectVendor(){
+    handleSelectVendor() {
       this.$refs.vendorSelect.showFlag = true;
     },
     //供应商选择弹出框
-    onVendorSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.vendorId = obj.vendorId;
-          this.form.vendorCode = obj.vendorCode;
-          this.form.vendorName = obj.vendorName;
-          this.form.vendorNick = obj.vendorNick;
-        }
+    onVendorSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.vendorId = obj.vendorId;
+        this.form.vendorCode = obj.vendorCode;
+        this.form.vendorName = obj.vendorName;
+        this.form.vendorNick = obj.vendorNick;
+      }
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('ITEMRECPT_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("ITEMRECPT_CODE").then((response) => {
           this.form.recptCode = response;
         });
-      }else{
+      } else {
         this.form.recptCode = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
@@ -573,4 +863,4 @@ export default {
   flex: 0 1 54%;
   order: 1;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue
index 4b20b1e..672f5ea 100644
--- a/src/views/mes/wm/itemrecpt/line.vue
+++ b/src/views/mes/wm/itemrecpt/line.vue
@@ -121,7 +121,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="入库仓库" prop="warehouseId">
               <el-cascader v-model="warehouseInfo"
                 :options="warehouseOptions"
@@ -130,7 +130,7 @@
               >                  
               </el-cascader>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="是否检验">
               <el-radio-group v-model="form.iqcCheck" disabled v-if="optType=='view'">
diff --git a/src/views/mes/wm/location/index.vue b/src/views/mes/wm/location/index.vue
index 14e45d0..b60a4fa 100644
--- a/src/views/mes/wm/location/index.vue
+++ b/src/views/mes/wm/location/index.vue
@@ -157,7 +157,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       warehouseId: undefined,
       // 遮罩层
@@ -242,7 +242,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -267,6 +267,9 @@ export default {
       this.open = true;
       this.title = "添加库区设置";
       this.optType = "add";
+        genCode('LOCATION_CODE').then(response =>{
+          this.form.locationCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue
index 608e2a3..d93db38 100644
--- a/src/views/mes/wm/outsourceissue/index.vue
+++ b/src/views/mes/wm/outsourceissue/index.vue
@@ -250,7 +250,7 @@ export default {
   components: {Issueline,WorkorderSelect},
   data() {
     return {
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       warehouseInfo:[],
       warehouseOptions:[],
@@ -376,7 +376,7 @@ export default {
         updateBy: null,        
         updateTime: null      
       };
-      this.autoGenFlag = false;  
+      this.autoGenFlag = true;  
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -401,6 +401,9 @@ export default {
       this.open = true;
       this.title = "添加外协发料单头";
       this.optType = "add";
+        genCode('OUTSOURCE_ISSUE_CODE').then(response =>{
+          this.form.issueCode = response;
+        });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/mes/wm/outsourcerecpt/index.vue b/src/views/mes/wm/outsourcerecpt/index.vue
index 352d39f..540f57c 100644
--- a/src/views/mes/wm/outsourcerecpt/index.vue
+++ b/src/views/mes/wm/outsourcerecpt/index.vue
@@ -258,7 +258,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       warehouseInfo:[],
       warehouseOptions:[],
@@ -347,7 +347,7 @@ export default {
         areaId: null, areaCode: null, areaName: null, recptDate: new Date(), 
         status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null
       };
-        this.autoGenFlag = false;     
+        this.autoGenFlag = true;     
         this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -372,6 +372,9 @@ export default {
       this.open = true;
       this.title = "添加外协入库单";
       this.optType = "add";
+        genCode('OUTSOURCE_RECPT_CODE').then(response =>{
+          this.form.recptCode = response;
+        });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/mes/wm/package/index.vue b/src/views/mes/wm/package/index.vue
index 34cd3dd..fd062d4 100644
--- a/src/views/mes/wm/package/index.vue
+++ b/src/views/mes/wm/package/index.vue
@@ -290,7 +290,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -430,7 +430,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -467,6 +467,9 @@ export default {
       this.open = true;
       this.title = "添加装箱单";
       this.optType="add";
+        genCode('PACKAGE_CODE').then(response =>{
+          this.form.packageCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue
index 1a6030c..c198877 100644
--- a/src/views/mes/wm/productrecpt/index.vue
+++ b/src/views/mes/wm/productrecpt/index.vue
@@ -58,7 +58,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:wm:productrecpt:edit']"
+          v-hasPermi="['mes:productrecpt:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -69,7 +69,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:wm:productrecpt:remove']"
+          v-hasPermi="['mes:productrecpt:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -110,7 +110,7 @@
             icon="el-icon-video-play"
             v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
-            v-hasPermi="['mes:wm:productrecpt:edit']"
+            v-hasPermi="['mes:productrecpt:edit']"
           >执行入库</el-button>
           <el-button
             size="mini"
@@ -118,7 +118,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:wm:productrecpt:edit']"
+            v-hasPermi="['mes:productrecpt:edit']"
           >修改</el-button>
           <el-button
             size="mini"
@@ -126,12 +126,12 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:wm:productrecpt:remove']"
+            v-hasPermi="['mes:productrecpt:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -154,7 +154,7 @@
               <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
                   active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">               
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
               </el-switch>
             </el-form-item>
           </el-col>
@@ -188,7 +188,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>       
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -197,13 +197,13 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider> 
+      <el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider>
       <el-card shadow="always" v-if="form.recptId !=null" class="box-card">
         <Productrecptline :recptId="form.recptId" :optType="optType" :workorderId="form.workorderId" :itemId="form.itemId"></Productrecptline>
       </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>        
+        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -223,7 +223,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       warehouseInfo:[],
       warehouseOptions:[],
@@ -302,16 +302,16 @@ export default {
       });
     },
     getWarehouseList(){
-      getTreeList().then( response =>{        
+      getTreeList().then( response =>{
         this.warehouseOptions = response.data;
         this.warehouseOptions.map(w =>{
           w.children.map(l =>{
-                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');                  
+                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
                   l.children = JSON.parse(lstr);
           });
-            
-          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');  
-          w.children =  JSON.parse(wstr); 
+
+          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
+          w.children =  JSON.parse(wstr);
 
         });
         let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@@ -359,7 +359,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -383,6 +383,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加产品入库单";
+        genCode('PRODUCTRECPT_CODE').then(response =>{
+          this.form.recptCode = response;
+        });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -459,7 +462,7 @@ export default {
       }
     },
     //选择默认的仓库、库区、库位
-    handleWarehouseChanged(obj){      
+    handleWarehouseChanged(obj){
       if(obj !=null){
         this.form.warehouseId = obj[0];
         this.form.locationId = obj[1];
diff --git a/src/views/mes/wm/productsalse/index.vue b/src/views/mes/wm/productsalse/index.vue
index 51cfde4..e7ae666 100644
--- a/src/views/mes/wm/productsalse/index.vue
+++ b/src/views/mes/wm/productsalse/index.vue
@@ -253,7 +253,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       warehouseInfo:[],
       warehouseOptions:[],
@@ -403,7 +403,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -442,6 +442,9 @@ export default {
       this.open = true;
       this.title = "添加销售出库单";
       this.optType = "add";
+        genCode('PRODUCTSALSE_CODE').then(response =>{
+          this.form.salseCode = response;
+        });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/mes/wm/productsalse/line.vue b/src/views/mes/wm/productsalse/line.vue
index b43549f..e6efac9 100644
--- a/src/views/mes/wm/productsalse/line.vue
+++ b/src/views/mes/wm/productsalse/line.vue
@@ -9,7 +9,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:wm:productsalse:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -20,7 +21,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:wm:productsalse:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -31,30 +33,71 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:wm:productsalse:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="productsalselineList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="productsalselineList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="产品编码" width="120px" align="center" prop="itemCode" />
-      <el-table-column label="产品名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
-      <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="产品编码"
+        width="120px"
+        align="center"
+        prop="itemCode"
+      />
+      <el-table-column
+        label="产品名称"
+        width="150px"
+        align="center"
+        prop="itemName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="specification"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="出库数量" align="center" prop="quantitySalse" />
-      <el-table-column label="批次号" width="120px" align="center" prop="batchCode" />
+      <el-table-column
+        label="批次号"
+        width="120px"
+        align="center"
+        prop="batchCode"
+      />
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
       <el-table-column label="库区名称" align="center" prop="locationName" />
       <el-table-column label="库位名称" align="center" prop="areaName" />
       <el-table-column label="是否检验" align="center" prop="iqcCheck">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.oqcCheck"/>
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.oqcCheck"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="检验单编号" width="120" align="center" prop="oqcCode" />
+      <el-table-column
+        label="检验单编号"
+        width="120"
+        align="center"
+        prop="oqcCode"
+      />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -63,13 +106,14 @@
             @click="handleDelete(scope.row)"
             v-if="optType != 'view'"
             v-hasPermi="['mes:wm:productsalse:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -82,15 +126,25 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="产品编码" prop="itemCode">
-              <el-input v-model="form.itemCode" placeholder="请选择库存物资" >
-                <el-button slot="append" @click="handleSelectStock" icon="el-icon-search"></el-button>
+              <el-input v-model="form.itemCode" placeholder="请选择库存物资">
+                <el-button
+                  slot="append"
+                  @click="handleSelectStock"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
             </el-form-item>
-            <StockSelect ref="stockSelect"  @onSelected="onStockSelected"></StockSelect>
+            <StockSelect
+              ref="stockSelect"
+              @onSelected="onStockSelected"
+            ></StockSelect>
           </el-col>
           <el-col :span="8">
             <el-form-item label="产品名称" prop="itemName">
-              <el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
+              <el-input
+                v-model="form.itemName"
+                placeholder="请输入产品物料名称"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -102,9 +156,13 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="规格型号" prop="specification">
-              <el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.specification"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -126,29 +184,39 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="批次号" prop="batchCode">
-              <el-input v-model="form.batchCode"/>
+              <el-input v-model="form.batchCode" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="生产工单" prop="workorderCode">
-              <el-input v-model="form.workorderCode"/>
+              <el-input v-model="form.workorderCode" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="出库数量" prop="quantitySalse">
-              <el-input :max="form.quantityMax" :min="0" v-model="form.quantitySalse" placeholder="请输入出库数量" />
+              <el-input
+                :max="form.quantityMax"
+                :min="0"
+                v-model="form.quantitySalse"
+                placeholder="请输入出库数量"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="是否检验">
-              <el-radio-group v-model="form.oqcCheck" disabled v-if="optType=='view'">
+              <el-radio-group
+                v-model="form.oqcCheck"
+                disabled
+                v-if="optType == 'view'"
+              >
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
 
               <el-radio-group v-model="form.oqcCheck" v-else>
@@ -156,23 +224,39 @@
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="form.oqcCheck == 'Y'" label="出货检验单" prop="oqcCode">
-              <el-input v-model="form.oqcCode" placeholder="请输入出货检验单" >
-                <el-button slot="append" @click="handleSelectOqc" icon="el-icon-search"></el-button>
+            <el-form-item
+              v-if="form.oqcCheck == 'Y'"
+              label="出货检验单"
+              prop="oqcCode"
+            >
+              <el-input v-model="form.oqcCode" placeholder="请输入出货检验单">
+                <el-button
+                  slot="append"
+                  @click="handleSelectOqc"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
             </el-form-item>
-            <OqcSelectSingle ref="oqcSelect" @onSelected="onOqcSelected"></OqcSelectSingle>
+            <OqcSelectSingle
+              ref="oqcSelect"
+              @onSelected="onOqcSelected"
+            ></OqcSelectSingle>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -186,30 +270,36 @@
 </template>
 
 <script>
-import { listProductsalseline, getProductsalseline, delProductsalseline, addProductsalseline, updateProductsalseline } from "@/api/mes/wm/productsalseline";
-import StockSelect from "@/components/stockSelect/single.vue"
-import OqcSelectSingle from "@/components/oqcSelect/single.vue"
+import {
+  listProductsalseline,
+  getProductsalseline,
+  delProductsalseline,
+  addProductsalseline,
+  updateProductsalseline,
+} from "@/api/mes/wm/productsalseline";
+import StockSelect from "@/components/stockSelect/single.vue";
+import OqcSelectSingle from "@/components/oqcSelect/single.vue";
 export default {
   name: "Productsalseline",
-  dicts: ['sys_yes_no'],
-  components: {StockSelect,OqcSelectSingle},
+  dicts: ["sys_yes_no"],
+  components: { StockSelect, OqcSelectSingle },
   props: {
     salseId: null,
     optType: null,
     warehouseId: null,
     locationId: null,
-    areaId: null
+    areaId: null,
   },
   data() {
     return {
       // 遮罩层
       loading: true,
-      warehouseInfo:[],
-      warehouseOptions:[],
-      warehouseProps:{
+      warehouseInfo: [],
+      warehouseOptions: [],
+      warehouseProps: {
         multiple: false,
-        value: 'pId',
-        label: 'pName',
+        value: "pId",
+        label: "pName",
       },
       // 选中数组
       ids: [],
@@ -250,20 +340,21 @@ export default {
         areaCode: null,
         areaName: null,
       },
+      quantitySalse: "",
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         itemCode: [
-          { required: true, message: "出库物资不能为空", trigger: "blur" }
+          { required: true, message: "出库物资不能为空", trigger: "blur" },
         ],
         warehouseInfo: [
-          { required: true, message: "仓库不能为空", trigger: "blur" }
+          { required: true, message: "仓库不能为空", trigger: "blur" },
         ],
         quantitySalse: [
-          { required: true, message: "出库数量不能为空", trigger: "blur" }
+          { required: true, message: "出库数量不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -273,7 +364,7 @@ export default {
     /** 查询产品销售出库行列表 */
     getList() {
       this.loading = true;
-      listProductsalseline(this.queryParams).then(response => {
+      listProductsalseline(this.queryParams).then((response) => {
         this.productsalselineList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -308,7 +399,7 @@ export default {
         areaId: this.areaId,
         areaCode: null,
         areaName: null,
-        oqcCheck: 'N',
+        oqcCheck: "N",
         oqcId: null,
         oqcCode: null,
         remark: null,
@@ -319,7 +410,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.resetForm("form");
     },
@@ -335,9 +426,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.lineId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.lineId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -348,8 +439,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const lineId = row.lineId || this.ids
-      getProductsalseline(lineId).then(response => {
+      const lineId = row.lineId || this.ids;
+      getProductsalseline(lineId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改产品销售出库行";
@@ -357,16 +448,22 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.lineId != null) {
-            updateProductsalseline(this.form).then(response => {
+            updateProductsalseline(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addProductsalseline(this.form).then(response => {
+            if (this.form.quantitySalse > this.quantitySalse) {
+              this.$message({
+                message: "数量不足",
+                type: "warning",
+              });
+            }
+            addProductsalseline(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -378,60 +475,68 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const lineIds = row.lineId || this.ids;
-      this.$modal.confirm('是否确认删除产品销售出库行编号为"' + lineIds + '"的数据项？').then(function() {
-        return delProductsalseline(lineIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除产品销售出库行编号为"' + lineIds + '"的数据项？')
+        .then(function () {
+          return delProductsalseline(lineIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('wm/productsalseline/export', {
-        ...this.queryParams
-      }, `productsalseline_${new Date().getTime()}.xlsx`)
+      this.download(
+        "wm/productsalseline/export",
+        {
+          ...this.queryParams,
+        },
+        `productsalseline_${new Date().getTime()}.xlsx`
+      );
     },
-    handleSelectStock(){
+    handleSelectStock() {
       this.$refs.stockSelect.showFlag = true;
       this.$refs.stockSelect.getList();
     },
     //物料选择弹出框
-    onStockSelected(obj){
-        if(obj != undefined && obj != null){
-          debugger;
-          this.form.materialStockId = obj.materialStockId;
-          this.form.itemId = obj.itemId;
-          this.form.itemCode = obj.itemCode;
-          this.form.itemName = obj.itemName;
-          this.form.specification = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
-          this.form.batchCode = obj.batchCode;
-          this.form.workorderId = obj.workorderId;
-          this.form.workorderCode = obj.workorderCode;
-          this.form.warehouseId = obj.warehouseId;
-          this.form.warehouseCode = obj.warehouseCode;
-          this.form.warehouseName = obj.warehouseName;
-          this.form.locationId = obj.locationId;
-          this.form.locationCode = obj.locationCode;
-          this.form.locationName = obj.locationName;
-          this.form.areaId = obj.areaId;
-          this.form.areaCode = obj.areaCode;
-          this.form.areaName = obj.areaName;
-          this.form.quantitySalse = obj.quantityOnhand;
-          this.form.quantityMax = obj.quantityOnhand;
-        }
+    onStockSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.materialStockId = obj.materialStockId;
+        this.form.itemId = obj.itemId;
+        this.form.itemCode = obj.itemCode;
+        this.form.itemName = obj.itemName;
+        this.form.specification = obj.specification;
+        this.form.unitOfMeasure = obj.unitOfMeasure;
+        this.form.batchCode = obj.batchCode;
+        this.form.workorderId = obj.workorderId;
+        this.form.workorderCode = obj.workorderCode;
+        this.form.warehouseId = obj.warehouseId;
+        this.form.warehouseCode = obj.warehouseCode;
+        this.form.warehouseName = obj.warehouseName;
+        this.form.locationId = obj.locationId;
+        this.form.locationCode = obj.locationCode;
+        this.form.locationName = obj.locationName;
+        this.form.areaId = obj.areaId;
+        this.form.areaCode = obj.areaCode;
+        this.form.areaName = obj.areaName;
+        this.form.quantitySalse = obj.quantityOnhand;
+        this.form.quantityMax = obj.quantityOnhand;
+        this.quantitySalse = obj.quantityOnhand;
+      }
     },
     //OQC检验单选择
-    handleSelectOqc(){
+    handleSelectOqc() {
       this.$refs.oqcSelect.showFlag = true;
     },
     //OQC检验单选择弹出框
-    onOqcSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.oqcId = obj.oqcId;
-          this.form.oqcCode = obj.oqcCode;
-        }
+    onOqcSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.oqcId = obj.oqcId;
+        this.form.oqcCode = obj.oqcCode;
+      }
     },
-  }
+  },
 };
 </script>
diff --git a/src/views/mes/wm/rtissue/index.vue b/src/views/mes/wm/rtissue/index.vue
index 2b0ca16..5f6d3ea 100644
--- a/src/views/mes/wm/rtissue/index.vue
+++ b/src/views/mes/wm/rtissue/index.vue
@@ -220,7 +220,7 @@ export default {
   },
   data() {
     return {
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       warehouseInfo:[],
       warehouseOptions:[],
@@ -349,7 +349,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;  
+      this.autoGenFlag = true;  
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -374,6 +374,9 @@ export default {
       this.open = true;
       this.title = "添加生产退料单头";
       this.optType = "add";
+        genCode('RTISSUE_CODE').then(response =>{
+          this.form.rtCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/wm/rtsalse/index.vue b/src/views/mes/wm/rtsalse/index.vue
index 22081ed..414c5a9 100644
--- a/src/views/mes/wm/rtsalse/index.vue
+++ b/src/views/mes/wm/rtsalse/index.vue
@@ -276,7 +276,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       warehouseInfo:[],
       warehouseOptions:[],
@@ -434,7 +434,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -471,6 +471,9 @@ export default {
       this.open = true;
       this.title = "添加产品销售退货单";
       this.optType = "add";
+        genCode('RTSALSE_CODE').then(response =>{
+          this.form.rtCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue
index 94a0734..10cbe3f 100644
--- a/src/views/mes/wm/rtvendor/index.vue
+++ b/src/views/mes/wm/rtvendor/index.vue
@@ -249,7 +249,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -363,6 +363,9 @@ export default {
       this.open = true;
       this.title = "添加供应商退货";
       this.optType = "add";
+        genCode('WM_RTVENDOR_CODE').then(response =>{
+          this.form.rtCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/wm/transfer/index.vue b/src/views/mes/wm/transfer/index.vue
index c8a7d27..9dffab3 100644
--- a/src/views/mes/wm/transfer/index.vue
+++ b/src/views/mes/wm/transfer/index.vue
@@ -297,7 +297,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,      
       // 遮罩层
       loading: true,
@@ -401,7 +401,7 @@ export default {
         updateBy: null,        
         updateTime: null      
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -426,6 +426,9 @@ export default {
       this.open = true;
       this.title = "添加转移单";
       this.optType = "add";      
+        genCode('TRANSFER_CODE').then(response =>{
+          this.form.transferCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue
index 35b1718..7ece9f2 100644
--- a/src/views/mes/wm/warehouse/index.vue
+++ b/src/views/mes/wm/warehouse/index.vue
@@ -182,7 +182,7 @@ export default {
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag:true,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -262,7 +262,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.autoGenFlag = false;
+      this.autoGenFlag = true;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -287,6 +287,9 @@ export default {
       this.open = true;
       this.title = "添加仓库设置";
       this.optType = "add";
+        genCode('WAREHOUSE_CODE').then(response =>{
+          this.form.warehouseCode = response;
+        });
     },
     // 查询明细按钮操作
     handleView(row){
diff --git a/src/views/register.vue b/src/views/register.vue
index e661ada..e34ca81 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">苦糖果MES</h3>
+      <h3 class="title">智造大师</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
diff --git a/src/views/system/FactoryInformation/index.vue b/src/views/system/FactoryInformation/index.vue
new file mode 100644
index 0000000..9bbf314
--- /dev/null
+++ b/src/views/system/FactoryInformation/index.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class="app-container">
+    <el-card header="工厂信息维护" shadow="never" style="min-height:600px">
+      <div style="width: 98%;margin:0 auto">
+        <el-form ref="contractForm" :model="contractForm" :rules="contractRules" label-width="110px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item prop="organName" label="工厂名称:" label-width="165px">
+                <el-input v-model="contractForm.organName" :disabled="isEdit" maxlength="20" style="width: 350pxpx" placeholder="请录入工厂名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="organJurPerson" label="法定代表人:">
+                <el-input v-model="contractForm.organJurPerson" style="width: 350pxpx" maxlength="10" placeholder="请录入法人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="organPhone" label="工厂联系方式:" label-width="165px">
+                <el-input v-model="contractForm.organPhone" style="width: 350pxpx" maxlength="15" placeholder="请录入工厂联系方式" />
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="12">
+              <el-form-item prop="userName" label="用户名:" >
+                <el-input v-model="contractForm.userName" style="width: 350pxpx" maxlength="30" placeholder="请录入用户名" />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="12">
+              <el-form-item prop="taxNumber" label="统一社会信用代码:" label-width="165px">
+                <el-input v-model="contractForm.taxNumber" :disabled="isEdit" style="width: 350pxpx" maxlength="20" placeholder="请录入统一社会信用代码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item  label="工厂顶图:" label-width="165px">
+                  <el-upload
+                    class="inline-block"
+                    action="/prod-api/common/uploadMinio"
+                    list-type="picture-card"
+                    :headers="headers"
+                    :auto-upload="false"
+                    :on-success="handlerSuccess"
+                    :on-change="changeLogo"
+                    :on-remove="showLogo"
+                    accept="jpeg,jpg,png"
+                    name="file"
+                    ref="upload"
+                    :limit="1"
+                  >
+                    <img
+                      v-show="isShow"
+                      width="100%"
+                      :src="this.contractForm.picture"
+                    />
+                    <!-- <i slot="default" class="el-icon-plus"></i> -->
+                  </el-upload>
+                  <span style="display:inline-block;position: relative;top: 60px;left:20px"><el-button plain @click="uploadImg" >上传</el-button></span>
+                  <div style="color: red">注 ：您最多只能上传一张图片,图片尺寸为1000px*40px,并且图片大小不能超过2M</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          <el-row>
+            <el-col :span="24" style="text-align:center;">
+              <el-button type="primary" @click="confirm"> 保 存 </el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import * as ownerServer from '@/api/ownerContract'
+  import { getToken } from "@/utils/auth";
+  export default {
+    data() {
+      return {
+        headers: {
+        Authorization: "Bearer " + getToken()
+        },
+        isShow:true,
+        contractForm: {
+          id: '',
+          organName: '',
+          contControlId: 'HT001',
+          address: '',
+          postCode: '',
+          jurPerson: '',
+          agentPerson: '',
+          telFax: '',
+          bankName: '',
+          bankNo: '',
+          taxNumber: ''
+        },
+        isEdit: false,
+        contractRules: {
+          organName: [{ required: true, message: '请录入工厂名称', trigger: 'blur' }],
+          organJurPerson: [{ required: true, message: '请录入法定代表人', trigger: 'blur' }],
+          organPhone: [{ required: true, message: '请录入工厂联系方式', trigger: 'blur' }],
+          userName: [{ required: true, message: '请录入用户名', trigger: 'blur' }],
+        },
+        fileFormats:["jpep","png","jpg"],
+
+      }
+    },
+    created() {
+      this.getOwnInfo()
+    },
+    methods: {
+      changeLogo(file){
+        const isLt2M = file.size / 1024 / 1024 < 2;
+        let suffixFile=file.name.substring(file.name.lastIndexOf("\.")+1);
+        if (!this.fileFormats.includes(suffixFile)){
+          this.$refs.upload.clearFiles();
+          this.$message.error('上传图片格式只能是.jpg,.jpeg,.png');
+        }else if(!isLt2M){
+          this.$refs.upload.clearFiles();
+          this.$message.error('上传头像图片大小不能超过 2MB!');
+        }else{
+          let vue=this;
+          let url = window.URL || window.webkitURL;
+          let img = new Image();
+          img.src = url.createObjectURL(file.raw);
+          img.onload=function () {
+            if(!(this.width==1000&&this.height==40)){
+              vue.$refs.upload.clearFiles();
+              vue.$message.error('图片尺寸必须是1000*40的图片');
+            }else{
+              vue.isShow=false;
+            }
+          }
+        }
+      },
+      showLogo(){
+        this.isShow=true;
+      },
+      handlerSuccess(companyImg) {
+        console.log(companyImg);
+        this.contractForm.picture = companyImg.fileName;
+      },
+      uploadImg() {
+        if (this.$refs.upload.uploadFiles.length>0){
+          this.$refs.upload.submit()
+        }else{
+          this.$message.error('请先选择图片');
+        }
+      },
+      beforeLogoUpload(file) {
+        // console.log(file);
+        // const isJPG = file.type === 'image/jpeg';
+        // const isLt2M = file.size / 1024 / 1024 < 2;
+        //
+        // if (!isJPG) {
+        //   this.$message.error('上传头像图片只能是 JPG 格式!');
+        // }
+        // if (!isLt2M) {
+        //   this.$message.error('上传头像图片大小不能超过 2MB!');
+        // }
+        // return isJPG && isLt2M;
+      },
+      getOwnInfo() {
+          ownerServer.getOrganInfo().then(res => {
+            if (res.code === 200 && res.data) {
+              this.contractForm = res.data;
+              this.$store.commit("companyImg/SET_LOGO",this.$store.getters.sysBaseUrl + '/reportImg/' + this.contractForm.picture);
+              this.$store.commit("companyImg/SET_IS_LOGO",true);
+              this.isEdit = true;
+            }
+          })
+      },
+      confirm() {
+        this.$refs.contractForm.validate(valid => {
+          if (valid) {
+            this.contractForm.contControlId = 'HT001'
+            if (!this.isEdit) {
+              ownerServer.modifyOwnerContBaseById(this.contractForm).then(result => {
+                if (result.code === 200) {
+                  this.$notify({
+                    title: '成功',
+                    message: result.message,
+                    type: 'success'
+                  })
+                  this.getOwnInfo()
+                } else {
+                  this.$notify({
+                    title: '失败',
+                    message: result.message,
+                    type: 'error'
+                  })
+                }
+              })
+            } else {
+              ownerServer.modifyOwnerContBaseById(this.contractForm).then(result => {
+                if (result.code === 200) {
+                  this.$notify({
+                    title: '成功',
+                    message: result.msg,
+                    type: 'success'
+                  })
+                } else {
+                  this.$notify({
+                    title: '失败',
+                    message: result.msg,
+                    type: 'error'
+                  })
+                }
+              })
+            }
+          } else {
+            this.$message.error('请录入完整信息')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+  ::v-deep .el-card .el-card__header {
+    padding: 15px 20px;
+    background: #F3F2F2;
+  }
+  .inline-block {
+    display: inline-block;
+    /*border: 1px solid black;*/
+  }
+
+  /*::v-deep .el-upload{*/
+  /*width: 500px;*/
+  /*}*/
+</style>
diff --git a/src/views/system/autocode/index.vue b/src/views/system/autocode/index.vue
index cd540db..e69de29 100644
--- a/src/views/system/autocode/index.vue
+++ b/src/views/system/autocode/index.vue
@@ -1,335 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="规则名称" prop="ruleName">
-        <el-input
-          v-model="queryParams.ruleName"
-          placeholder="请输入规则名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规则编码" prop="ruleCode">
-        <el-input
-          v-model="queryParams.ruleCode"
-          placeholder="请输入规则编码"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="启用状态" prop="enableFlag">
-        <el-select
-          v-model="queryParams.enableFlag"
-          placeholder="启用状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:autocode:rule:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:autocode:rule:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:autocode:rule:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="规则编号" align="center" width="210px" prop="ruleCode" >
-          <template slot-scope="scope">
-          <router-link :to="'/system/autocodePart/index/' + scope.row.ruleId" class="link-type">
-            <span>{{ scope.row.ruleCode }}</span>
-          </router-link>
-        </template>
-      </el-table-column>
-      <el-table-column label="规则名称" align="center" prop="ruleName" :show-overflow-tooltip="true" />
-      <el-table-column label="最大长度" align="center" prop="maxLength" />
-      <el-table-column label="是否补齐" align="center" prop="isPadded" />
-      <el-table-column label="是否可用" align="center" prop="enableFlag">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:autocode:rule:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:autocode:rule:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="规则编码" prop="ruleCode">
-          <el-input v-model="form.ruleCode" placeholder="请输入规则编码" />
-        </el-form-item>
-        <el-form-item label="规则名称" prop="ruleName">
-          <el-input v-model="form.ruleName" placeholder="请输入规则名称" />
-        </el-form-item>
-        <el-form-item label="描述" prop="ruleDesc">
-          <el-input v-model="form.ruleDesc" placeholder="请输入描述信息" />
-        </el-form-item>
-        <el-form-item label="最大长度" prop="maxLength">
-          <el-input-number v-model="form.maxLength" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="是否补齐" prop="isPadded">
-          <el-radio-group v-model="form.isPadded">
-                <el-radio label="Y">是</el-radio>
-                <el-radio label="N">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="补齐字符" prop="paddedChar" v-if="form.isPadded == 'Y'">
-          <el-input v-model="form.paddedChar" placeholder="请输入补齐字符" />
-        </el-form-item>
-        <el-form-item label="补齐方式" prop="paddedMethod" v-if="form.isPadded == 'Y'">
-          <el-radio-group v-model="form.paddedMethod">
-                <el-radio label="L">左补齐</el-radio>
-                <el-radio label="R">右补齐</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="是否启用" prop="enableFlag">
-          <el-radio-group v-model="form.enableFlag">
-            <el-radio
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listRule, getRule, delRule, addRule, updateRule } from "@/api/system/autocode/rule";
-
-export default {
-  name: "autoCodeRule",
-  dicts: ['sys_yes_no'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      ruleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        ruleCode: undefined,
-        ruleName: undefined,
-        enableFlag: 'Y'
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        ruleCode: [
-          { required: true, message: "规则编码不能为空", trigger: "blur" }
-        ],
-        ruleName: [
-          { required: true, message: "规则名称不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      listRule(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.ruleList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        ruleId: undefined,
-        ruleCode: undefined,
-        ruleName: undefined,
-        ruleDesc: undefined,
-        maxLength: undefined,
-        isPadded: 'N',
-        enableFlag: "Y",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加编码规则";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.ruleId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const ruleId = row.ruleId || this.ids
-      getRule(ruleId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改编码规则";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.ruleId != undefined) {
-            updateRule(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRule(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-        debugger;
-      const ruleIds = row.ruleId || this.ids;
-      this.$modal.confirm('是否确认删除编码规则为"' + ruleIds + '"的数据项？').then(function() {
-        return delRule(ruleIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-      });
-    }
-  }
-};
-</script>
\ No newline at end of file
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 7fe465c..e69de29 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -1,399 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="字典名称" prop="dictType">
-        <el-select v-model="queryParams.dictType">
-          <el-option
-            v-for="item in typeOptions"
-            :key="item.dictId"
-            :label="item.dictName"
-            :value="item.dictType"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="字典标签" prop="dictLabel">
-        <el-input
-          v-model="queryParams.dictLabel"
-          placeholder="请输入字典标签"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-close"
-          size="mini"
-          @click="handleClose"
-        >关闭</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编码" align="center" prop="dictCode" />
-      <el-table-column label="字典标签" align="center" prop="dictLabel">
-        <template slot-scope="scope">
-          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
-          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="字典键值" align="center" prop="dictValue" />
-      <el-table-column label="字典排序" align="center" prop="dictSort" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dict:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典类型">
-          <el-input v-model="form.dictType" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="数据标签" prop="dictLabel">
-          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
-        </el-form-item>
-        <el-form-item label="数据键值" prop="dictValue">
-          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
-        </el-form-item>
-        <el-form-item label="样式属性" prop="cssClass">
-          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
-        </el-form-item>
-        <el-form-item label="显示排序" prop="dictSort">
-          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="回显样式" prop="listClass">
-          <el-select v-model="form.listClass">
-            <el-option
-              v-for="item in listClassOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { listType, getType } from "@/api/system/dict/type";
-
-export default {
-  name: "Data",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      dataList: [],
-      // 默认字典类型
-      defaultDictType: "",
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 数据标签回显样式
-      listClassOptions: [
-        {
-          value: "default",
-          label: "默认"
-        },
-        {
-          value: "primary",
-          label: "主要"
-        },
-        {
-          value: "success",
-          label: "成功"
-        },
-        {
-          value: "info",
-          label: "信息"
-        },
-        {
-          value: "warning",
-          label: "警告"
-        },
-        {
-          value: "danger",
-          label: "危险"
-        }
-      ],
-      // 类型数据字典
-      typeOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictLabel: [
-          { required: true, message: "数据标签不能为空", trigger: "blur" }
-        ],
-        dictValue: [
-          { required: true, message: "数据键值不能为空", trigger: "blur" }
-        ],
-        dictSort: [
-          { required: true, message: "数据顺序不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    const dictId = this.$route.params && this.$route.params.dictId;
-    this.getType(dictId);
-    this.getTypeList();
-  },
-  methods: {
-    /** 查询字典类型详细 */
-    getType(dictId) {
-      getType(dictId).then(response => {
-        this.queryParams.dictType = response.data.dictType;
-        this.defaultDictType = response.data.dictType;
-        this.getList();
-      });
-    },
-    /** 查询字典类型列表 */
-    getTypeList() {
-      listType().then(response => {
-        this.typeOptions = response.rows;
-      });
-    },
-    /** 查询字典数据列表 */
-    getList() {
-      this.loading = true;
-      listData(this.queryParams).then(response => {
-        this.dataList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictCode: undefined,
-        dictLabel: undefined,
-        dictValue: undefined,
-        cssClass: undefined,
-        listClass: 'default',
-        dictSort: 0,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 返回按钮操作 */
-    handleClose() {
-      const obj = { path: "/system/dict" };
-      this.$tab.closeOpenPage(obj);
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.queryParams.dictType = this.defaultDictType;
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加字典数据";
-      this.form.dictType = this.queryParams.dictType;
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictCode)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictCode = row.dictCode || this.ids
-      getData(dictCode).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改字典数据";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictCode != undefined) {
-            updateData(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addData(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictCodes = row.dictCode || this.ids;
-      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
-        return delData(dictCodes);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/data/export', {
-        ...this.queryParams
-      }, `data_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
\ No newline at end of file
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 74a8149..e69de29 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,346 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="字典名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入字典名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="字典类型" prop="dictType">
-        <el-input
-          v-model="queryParams.dictType"
-          placeholder="请输入字典类型"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="字典状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-refresh"
-          size="mini"
-          @click="handleRefreshCache"
-          v-hasPermi="['system:dict:remove']"
-        >刷新缓存</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
-            <span>{{ scope.row.dictType }}</span>
-          </router-link>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dict:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典名称" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
-        </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">
-          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
-export default {
-  name: "Dict",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加字典类型";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改字典类型";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-      });
-    }
-  }
-};
-</script>
\ No newline at end of file
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c30be85..b89e775 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+    >
       <el-form-item label="菜单名称" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
@@ -10,7 +16,11 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="菜单状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -20,8 +30,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -34,7 +52,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:menu:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -43,9 +62,13 @@
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
-        >展开/折叠</el-button>
+          >展开/折叠</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <el-table
@@ -54,20 +77,40 @@
       :data="menuList"
       row-key="menuId"
       :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+      <el-table-column
+        prop="menuName"
+        label="菜单名称"
+        :show-overflow-tooltip="true"
+        width="160"
+      ></el-table-column>
       <el-table-column prop="icon" label="图标" align="center" width="100">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
       </el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
-      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column
+        prop="orderNum"
+        label="排序"
+        width="60"
+      ></el-table-column>
+      <el-table-column
+        prop="perms"
+        label="权限标识"
+        :show-overflow-tooltip="true"
+      ></el-table-column>
+      <el-table-column
+        prop="component"
+        label="组件路径"
+        :show-overflow-tooltip="true"
+      ></el-table-column>
       <el-table-column prop="status" label="状态" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.sys_normal_disable"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime">
@@ -75,29 +118,36 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
-          <el-button 
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:menu:add']"
-          >新增</el-button>
+            >新增</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:menu:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -135,15 +185,24 @@
                 @show="$refs['iconSelect'].reset()"
               >
                 <IconSelect ref="iconSelect" @selected="selected" />
-                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
+                <el-input
+                  slot="reference"
+                  v-model="form.icon"
+                  placeholder="点击选择图标"
+                  readonly
+                >
                   <svg-icon
                     v-if="form.icon"
                     slot="prefix"
                     :icon-class="form.icon"
                     class="el-input__icon"
-                    style="height: 32px;width: 16px;"
+                    style="height: 32px; width: 16px"
+                  />
+                  <i
+                    v-else
+                    slot="prefix"
+                    class="el-icon-search el-input__icon"
                   />
-                  <i v-else slot="prefix" class="el-icon-search el-input__icon" />
                 </el-input>
               </el-popover>
             </el-form-item>
@@ -155,14 +214,21 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number
+                v-model="form.orderNum"
+                controls-position="right"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.menuType != 'F'">
             <el-form-item>
               <span slot="label">
-                <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
-                <i class="el-icon-question"></i>
+                <el-tooltip
+                  content="选择是外链则路由地址需要以`http(s)://`开头"
+                  placement="top"
+                >
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 是否外链
               </span>
@@ -175,8 +241,11 @@
           <el-col :span="12" v-if="form.menuType != 'F'">
             <el-form-item prop="path">
               <span slot="label">
-                <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
-                <i class="el-icon-question"></i>
+                <el-tooltip
+                  content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头"
+                  placement="top"
+                >
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 路由地址
               </span>
@@ -186,8 +255,11 @@
           <el-col :span="12" v-if="form.menuType == 'C'">
             <el-form-item prop="component">
               <span slot="label">
-                <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
-                <i class="el-icon-question"></i>
+                <el-tooltip
+                  content="访问的组件路径，如：`system/user/index`，默认在`views`目录下"
+                  placement="top"
+                >
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 组件路径
               </span>
@@ -196,10 +268,17 @@
           </el-col>
           <el-col :span="12" v-if="form.menuType != 'M'">
             <el-form-item>
-              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
+              <el-input
+                v-model="form.perms"
+                placeholder="请输入权限标识"
+                maxlength="100"
+              />
               <span slot="label">
-                <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
-                <i class="el-icon-question"></i>
+                <el-tooltip
+                  content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)"
+                  placement="top"
+                >
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 权限字符
               </span>
@@ -207,10 +286,17 @@
           </el-col>
           <el-col :span="12" v-if="form.menuType == 'C'">
             <el-form-item>
-              <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
+              <el-input
+                v-model="form.query"
+                placeholder="请输入路由参数"
+                maxlength="255"
+              />
               <span slot="label">
-                <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
-                <i class="el-icon-question"></i>
+                <el-tooltip
+                  content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`'
+                  placement="top"
+                >
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 路由参数
               </span>
@@ -219,8 +305,11 @@
           <el-col :span="12" v-if="form.menuType == 'C'">
             <el-form-item>
               <span slot="label">
-                <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
-                <i class="el-icon-question"></i>
+                <el-tooltip
+                  content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致"
+                  placement="top"
+                >
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 是否缓存
               </span>
@@ -233,8 +322,11 @@
           <el-col :span="12" v-if="form.menuType != 'F'">
             <el-form-item>
               <span slot="label">
-                <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
-                <i class="el-icon-question"></i>
+                <el-tooltip
+                  content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问"
+                  placement="top"
+                >
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 显示状态
               </span>
@@ -243,15 +335,19 @@
                   v-for="dict in dict.type.sys_show_hide"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.menuType != 'F'">
             <el-form-item>
               <span slot="label">
-                <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
-                <i class="el-icon-question"></i>
+                <el-tooltip
+                  content="选择停用则路由将不会出现在侧边栏，也不能被访问"
+                  placement="top"
+                >
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 菜单状态
               </span>
@@ -260,7 +356,8 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -275,14 +372,20 @@
 </template>
 
 <script>
-import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
+import {
+  listMenu,
+  getMenu,
+  delMenu,
+  addMenu,
+  updateMenu,
+} from "@/api/system/menu";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";
 
 export default {
   name: "Menu",
-  dicts: ['sys_show_hide', 'sys_normal_disable'],
+  dicts: ["sys_show_hide", "sys_normal_disable"],
   components: { Treeselect, IconSelect },
   data() {
     return {
@@ -305,22 +408,22 @@ export default {
       // 查询参数
       queryParams: {
         menuName: undefined,
-        visible: undefined
+        visible: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         menuName: [
-          { required: true, message: "菜单名称不能为空", trigger: "blur" }
+          { required: true, message: "菜单名称不能为空", trigger: "blur" },
         ],
         orderNum: [
-          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
+          { required: true, message: "菜单顺序不能为空", trigger: "blur" },
         ],
         path: [
-          { required: true, message: "路由地址不能为空", trigger: "blur" }
-        ]
-      }
+          { required: true, message: "路由地址不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -334,7 +437,7 @@ export default {
     /** 查询菜单列表 */
     getList() {
       this.loading = true;
-      listMenu(this.queryParams).then(response => {
+      listMenu(this.queryParams).then((response) => {
         this.menuList = this.handleTree(response.data, "menuId");
         this.loading = false;
       });
@@ -347,14 +450,14 @@ export default {
       return {
         id: node.menuId,
         label: node.menuName,
-        children: node.children
+        children: node.children,
       };
     },
     /** 查询菜单下拉树结构 */
     getTreeselect() {
-      listMenu().then(response => {
+      listMenu().then((response) => {
         this.menuOptions = [];
-        const menu = { menuId: 0, menuName: '主类目', children: [] };
+        const menu = { menuId: 0, menuName: "主类目", children: [] };
         menu.children = this.handleTree(response.data, "menuId");
         this.menuOptions.push(menu);
       });
@@ -376,7 +479,7 @@ export default {
         isFrame: "1",
         isCache: "0",
         visible: "0",
-        status: "0"
+        status: "0",
       };
       this.resetForm("form");
     },
@@ -413,24 +516,24 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
-      getMenu(row.menuId).then(response => {
+      getMenu(row.menuId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改菜单";
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.menuId != undefined) {
-            updateMenu(this.form).then(response => {
+            updateMenu(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addMenu(this.form).then(response => {
+            addMenu(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -441,13 +544,17 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function() {
-        return delMenu(row.menuId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
+      this.$modal
+        .confirm('是否确认删除名称为"' + row.menuName + '"的数据项？')
+        .then(function () {
+          return delMenu(row.menuId);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 9d34963..d94f425 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -134,6 +134,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-s-help" v-if="scope.row.createBy === 'admin'" @click="restoreRole(scope.row.roleId)">恢复默认菜单权限</el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
             <span class="el-dropdown-link">
               <i class="el-icon-d-arrow-right el-icon--right"></i>更多
@@ -254,7 +255,7 @@
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from "@/api/system/role";
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus,resetRole } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
 
@@ -603,6 +604,31 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+    // 恢复默认菜单权限
+    restoreRole(roleId) {
+      this.$confirm("确定恢复默认菜单权限吗?", '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        resetRole({roleId:roleId}).then(result => {
+          if (result.code === 200) {
+            this.$notify({
+              title: '成功',
+              message: result.message,
+              type: 'success'
+            })
+            this.getList();
+          } else {
+            this.$notify({
+              title: '失败',
+              message: result.message,
+              type: 'error'
+            })
+          }
+        })
+      }).catch(() => {})
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/role/export', {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 884e326..a66981c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -27,7 +27,14 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="用户名称" prop="userName">
             <el-input
               v-model="queryParams.userName"
@@ -73,8 +80,16 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
 
@@ -87,7 +102,8 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
-            >新增</el-button>
+              >新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -98,7 +114,8 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:user:edit']"
-            >修改</el-button>
+              >修改</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -109,7 +126,8 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-            >删除</el-button>
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -119,7 +137,8 @@
               size="mini"
               @click="handleImport"
               v-hasPermi="['system:user:import']"
-            >导入</el-button>
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -129,19 +148,67 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['system:user:export']"
-            >导出</el-button>
+              >导出</el-button
+            >
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+            :columns="columns"
+          ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          :data="userList"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+          <el-table-column
+            label="员工工号"
+            align="center"
+            key="userId"
+            prop="userId"
+            v-if="columns[0].visible"
+          />
+          <el-table-column
+            label="登录账号"
+            align="center"
+            key="userName"
+            prop="userName"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="员工姓名"
+            align="center"
+            key="nickName"
+            prop="nickName"
+            v-if="columns[2].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="部门"
+            align="center"
+            key="deptName"
+            prop="dept.deptName"
+            v-if="columns[3].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="手机号码"
+            align="center"
+            key="phonenumber"
+            prop="phonenumber"
+            v-if="columns[4].visible"
+            width="120"
+          />
+          <el-table-column
+            label="状态"
+            align="center"
+            key="status"
+            v-if="columns[5].visible"
+          >
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -151,7 +218,13 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            v-if="columns[6].visible"
+            width="160"
+          >
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -169,23 +242,37 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
-              >修改</el-button>
+                >修改</el-button
+              >
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                >删除</el-button
+              >
+              <el-dropdown
+                size="mini"
+                @command="(command) => handleCommand(command, scope.row)"
+                v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
+              >
                 <span class="el-dropdown-link">
                   <i class="el-icon-d-arrow-right el-icon--right"></i>更多
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                  <el-dropdown-item
+                    command="handleResetPwd"
+                    icon="el-icon-key"
+                    v-hasPermi="['system:user:resetPwd']"
+                    >重置密码</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    command="handleAuthRole"
+                    icon="el-icon-circle-check"
+                    v-hasPermi="['system:user:edit']"
+                    >分配角色</el-dropdown-item
+                  >
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -193,7 +280,7 @@
         </el-table>
 
         <pagination
-          v-show="total>0"
+          v-show="total > 0"
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
@@ -208,36 +295,71 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+              <el-input
+                v-model="form.nickName"
+                placeholder="请输入用户昵称"
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                placeholder="请选择归属部门"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input
+                v-model="form.phonenumber"
+                placeholder="请输入手机号码"
+                maxlength="11"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input
+                v-model="form.email"
+                placeholder="请输入邮箱"
+                maxlength="50"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            <el-form-item
+              v-if="form.userId == undefined"
+              label="用户名称"
+              prop="userName"
+            >
+              <el-input
+                v-model="form.userName"
+                placeholder="请输入用户名称"
+                maxlength="30"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+            <el-form-item
+              v-if="form.userId == undefined"
+              label="用户密码"
+              prop="password"
+            >
+              <el-input
+                v-model="form.password"
+                placeholder="请输入用户密码"
+                type="password"
+                maxlength="20"
+                show-password
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -261,7 +383,8 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -269,7 +392,11 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+              <el-select
+                v-model="form.postIds"
+                multiple
+                placeholder="请选择岗位"
+              >
                 <el-option
                   v-for="item in postOptions"
                   :key="item.postId"
@@ -282,7 +409,11 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select
+                v-model="form.roleIds"
+                multiple
+                placeholder="请选择角色"
+              >
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -297,7 +428,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +444,12 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
       <el-upload
         ref="upload"
         :limit="1"
@@ -326,10 +466,17 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport" />
+            是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -341,7 +488,15 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
+import {
+  listUser,
+  getUser,
+  delUser,
+  addUser,
+  updateUser,
+  resetUserPwd,
+  changeUserStatus,
+} from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
@@ -349,7 +504,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  dicts: ["sys_normal_disable", "sys_user_sex"],
   components: { Treeselect },
   data() {
     return {
@@ -387,7 +542,7 @@ export default {
       form: {},
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       // 用户导入参数
       upload: {
@@ -402,7 +557,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData",
       },
       // 查询参数
       queryParams: {
@@ -411,7 +566,7 @@ export default {
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined
+        deptId: undefined,
       },
       // 列信息
       columns: [
@@ -421,48 +576,58 @@ export default {
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 6, label: `创建时间`, visible: true },
       ],
       // 表单校验
       rules: {
         userName: [
           { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          {
+            min: 2,
+            max: 20,
+            message: "用户名称长度必须介于 2 和 20 之间",
+            trigger: "blur",
+          },
         ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "用户昵称不能为空", trigger: "blur" },
         ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          {
+            min: 5,
+            max: 20,
+            message: "用户密码长度必须介于 5 和 20 之间",
+            trigger: "blur",
+          },
         ],
         email: [
           {
             type: "email",
             message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
+            trigger: ["blur", "change"],
+          },
         ],
         phonenumber: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   created() {
     this.getList();
     this.getTreeselect();
-    this.getConfigKey("sys.user.initPassword").then(response => {
+    this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
   },
@@ -470,7 +635,8 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -479,8 +645,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then(response => {
-        debugger;
+      treeselect().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -497,13 +662,17 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
+      this.$modal
+        .confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
+        .then(function () {
+          return changeUserStatus(row.userId, row.status);
+        })
+        .then(() => {
+          this.$modal.msgSuccess(text + "成功");
+        })
+        .catch(function () {
+          row.status = row.status === "0" ? "1" : "0";
+        });
     },
     // 取消按钮
     cancel() {
@@ -524,7 +693,7 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
       };
       this.resetForm("form");
     },
@@ -541,7 +710,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
+      this.ids = selection.map((item) => item.userId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -562,7 +731,7 @@ export default {
     handleAdd() {
       this.reset();
       this.getTreeselect();
-      getUser().then(response => {
+      getUser().then((response) => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.open = true;
@@ -575,7 +744,7 @@ export default {
       this.reset();
       this.getTreeselect();
       const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
+      getUser(userId).then((response) => {
         this.form = response.data;
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
@@ -593,30 +762,32 @@ export default {
         cancelButtonText: "取消",
         closeOnClickModal: false,
         inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
-      }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+      })
+        .then(({ value }) => {
+          resetUserPwd(row.userId, value).then((response) => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 分配角色操作 */
-    handleAuthRole: function(row) {
+    handleAuthRole: function (row) {
       const userId = row.userId;
       this.$router.push("/system/user-auth/role/" + userId);
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+            updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            addUser(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -628,18 +799,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
+        .then(function () {
+          return delUser(userIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
+      this.download(
+        "system/user/export",
+        {
+          ...this.queryParams,
+        },
+        `user_${new Date().getTime()}.xlsx`
+      );
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -648,8 +827,11 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      this.download(
+        "system/user/importTemplate",
+        {},
+        `user_template_${new Date().getTime()}.xlsx`
+      );
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -660,13 +842,19 @@ export default {
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
       this.getList();
     },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
-    }
-  }
+    },
+  },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/vue.config.js b/vue.config.js
index 986bf66..9419505 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,15 +1,15 @@
-'use strict'
-const path = require('path')
+"use strict";
+const path = require("path");
 
 function resolve(dir) {
-  return path.join(__dirname, dir)
+  return path.join(__dirname, dir);
 }
 
-const CompressionPlugin = require('compression-webpack-plugin')
+const CompressionPlugin = require("compression-webpack-plugin");
 
-const name = process.env.VUE_APP_TITLE || '苦糖果MES-软件开发记录' // 网页标题
+const name = "智造大师"; // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -20,124 +20,126 @@ module.exports = {
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
+  outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
+  assetsDir: "static",
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: process.env.NODE_ENV === "development",
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
   // webpack-dev-server 相关配置
   devServer: {
-    host: '0.0.0.0',
+    host: "0.0.0.0",
     port: port,
     open: true,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+      "/prod-api": {
+        // 蚂蚁工业
+        // target: `http://192.168.2.104:8063`,
+        // 内网
+        // target: `http://192.168.50.191:8063`,
+        // 线上
+        target: `http://mes.jshengzheng.com:7072`,
         changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
+        // pathRewrite: {
+        //   ['^' + process.env.VUE_APP_BASE_API]: ''
+        // }
       },
-      '/ureport': {
-        target: 'http://localhost:8080',
-        ws:false,
+      "/ureport": {
+        // target: `http://192.168.2.104:8063`,
+        // target: `http://192.168.50.191:8063`,
+        target: `http://mes.jshengzheng.com:7072`,
+        ws: false,
         changeOrigin: true,
         pathRewrite: {
-          '^/ureport': '/ureport'
-        }
+          "^/ureport": "/ureport",
+        },
       },
     },
-    disableHostCheck: true
+    disableHostCheck: true,
   },
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: "expanded" }
-      }
-    }
+        sassOptions: { outputStyle: "expanded" },
+      },
+    },
   },
   configureWebpack: {
     name: name,
     resolve: {
       alias: {
-        '@': resolve('src')
-      }
+        "@": resolve("src"),
+      },
     },
     plugins: [
       // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
       new CompressionPlugin({
-        test: /\.(js|css|html)?$/i,     // 压缩文件格式
-        filename: '[path].gz[query]',   // 压缩后的文件名
-        algorithm: 'gzip',              // 使用gzip压缩
-        minRatio: 0.8                   // 压缩率小于1才会压缩
-      })
+        test: /\.(js|css|html)?$/i, // 压缩文件格式
+        filename: "[path].gz[query]", // 压缩后的文件名
+        algorithm: "gzip", // 使用gzip压缩
+        minRatio: 0.8, // 压缩率小于1才会压缩
+      }),
     ],
   },
   chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
+    config.plugins.delete("preload"); // TODO: need test
+    config.plugins.delete("prefetch"); // TODO: need test
 
     // set svg-sprite-loader
+    config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
     config.module
-      .rule('svg')
-      .exclude.add(resolve('src/assets/icons'))
-      .end()
-    config.module
-      .rule('icons')
+      .rule("icons")
       .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
+      .include.add(resolve("src/assets/icons"))
       .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
+      .use("svg-sprite-loader")
+      .loader("svg-sprite-loader")
       .options({
-        symbolId: 'icon-[name]'
+        symbolId: "icon-[name]",
       })
-      .end()
+      .end();
 
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
-            })
-          config.optimization.runtimeChunk('single'),
+    config.when(process.env.NODE_ENV !== "development", (config) => {
+      config
+        .plugin("ScriptExtHtmlWebpackPlugin")
+        .after("html")
+        .use("script-ext-html-webpack-plugin", [
           {
-             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-             to: './' //到根目录下
-          }
-        }
-      )
-  }
-}
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+            inline: /runtime\..*\.js$/,
+          },
+        ])
+        .end();
+      config.optimization.splitChunks({
+        chunks: "all",
+        cacheGroups: {
+          libs: {
+            name: "chunk-libs",
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: "initial", // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: "chunk-elementUI", // split elementUI into a single package
+            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+          },
+          commons: {
+            name: "chunk-commons",
+            test: resolve("src/components"), // can customize your rules
+            minChunks: 3, //  minimum common number
+            priority: 5,
+            reuseExistingChunk: true,
+          },
+        },
+      });
+      config.optimization.runtimeChunk("single"),
+        {
+          from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
+          to: "./", //到根目录下
+        };
+    });
+  },
+};