merge

Reviewed-on: #75

.drone.yml

@@ -12,7 +12,7 @@ steps:
   - name: dockerconfig
     path: /root/.docker
   commands:
-  - docker build -t harbor.picaiba.com/mes/mes-cigs-ui ./ && docker push harbor.picaiba.com/mes/mes-cigs-ui
+  - docker build -t harbor.picaiba.com/kszny/wms-ui:00a-1.0.0 ./ && docker push harbor.picaiba.com/kszny/wms-ui:00a-1.0.0
 
 - name: deploy
   image: harbor.picaiba.com/tools/kubectl:1.19.8
@@ -20,9 +20,9 @@ steps:
   - echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts
   #- echo "52.74.223.119 github.com" >> /etc/hosts
   - sleep 1
-  - kubectl scale --replicas=0 deployment/mes-ui -n mes-cigs
+  - kubectl scale --replicas=0 deployment/a-wms-ui -n wms
   - sleep 3
-  - kubectl scale --replicas=1 deployment/mes-ui -n mes-cigs
+  - kubectl scale --replicas=1 deployment/a-wms-ui -n wms
   depends_on:
   - build
 

.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = ''
 VUE_APP_REPORT_DESIGN_URL = '/ureport/designer'
-VUE_APP_REPORT_VIEW_URL = '/ureport/preview'
+VUE_APP_REPORT_VIEW_URL = '/ureport/preview'

.gitignore

@@ -22,4 +22,4 @@ selenium-debug.log
 package-lock.json
 yarn.lock
 /.env.development
-/vue.config.js
+vue.config.js

Dockerfile

@@ -1,9 +1,7 @@
 FROM node:12 AS builder
 WORKDIR /app
 ADD package.json /app/
-RUN npm install \
+RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install 
-    --registry=https://registry.npm.taobao.org \
-    --disturl=https://npm.taobao.org/dist
 ADD . /app
 RUN npm run build:prod
 

package.json

@@ -66,6 +66,7 @@
     "nprogress": "0.2.0",
     "outlayer": "^2.1.1",
     "path-to-regexp": "2.4.0",
+    "raphael": "git+https://gitee.com/shihairong/raphael",
     "screenfull": "4.2.0",
     "script-loader": "0.7.2",
     "showdown": "1.9.0",
@@ -96,7 +97,7 @@
     "@vue/test-utils": "1.0.0-beta.29",
     "autoprefixer": "^9.5.1",
     "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "10.0.1",
+    "babel-eslint": "^8.2.2",
     "babel-jest": "23.6.0",
     "chalk": "2.4.2",
     "chokidar": "2.1.5",

src/api/art-manage/art.js

@@ -2,42 +2,42 @@ import request from '@/utils/request'
 
 export function list(data) {
   return request({
-    url: '/process/process-flow/page',
+    url: '/api/process/process-flow/page',
     method: 'post',
     data
   })
 }
 export function getInfo(data) {
   return request({
-    url: '/process/process-flow/get',
+    url: '/api/process/process-flow/get',
     method: 'post',
     data
   })
 }
 export function enabled(data) {
   return request({
-    url: '/process/process-flow/enabled',
+    url: '/api/process/process-flow/enabled',
     method: 'post',
     data
   })
 }
 export function del(data) {
   return request({
-    url: '/process/process-flow/delete',
+    url: '/api/process/process-flow/delete',
     method: 'post',
     data
   })
 }
 export function update(data) {
   return request({
-    url: '/process/process-flow/update',
+    url: '/api/process/process-flow/update',
     method: 'post',
     data
   })
 }
 export function add(data) {
   return request({
-    url: '/process/process-flow/add',
+    url: '/api/process/process-flow/add',
     method: 'post',
     data
   })
@@ -45,7 +45,7 @@ export function add(data) {
 // 获取基板列表
 export function listSubstrate(data) {
   return request({
-    url: '/process/process-flow/substrateList',
+    url: '/api/process/process-flow/substrateList',
     method: 'post',
     data
   })
@@ -53,7 +53,7 @@ export function listSubstrate(data) {
 // 获取BOM列表
 export function listBom(data) {
   return request({
-    url: '/process/process-flow/bomList',
+    url: '/api/process/process-flow/bomList',
     method: 'post',
     data
   })
@@ -70,7 +70,7 @@ export function listEquipmentBom(data) {
 // 获取所有设备的bom
 export function listAllEquipmentBom(data) {
   return request({
-    url: '/process/process-flow-equipment/allEquipmentBomList',
+    url: '/api/process/process-flow-equipment/allEquipmentBomList',
     method: 'post',
     data
   })
@@ -86,7 +86,7 @@ export function listEquipmentRecipe(data) {
 // 获取所有设备下的配方
 export function listAllEquipmentRecipe(data) {
   return request({
-    url: '/process/process-flow-equipment/allEquipmentRecipeList',
+    url: '/api/process/process-flow-equipment/allEquipmentRecipeList',
     method: 'post',
     data
   })
@@ -94,7 +94,7 @@ export function listAllEquipmentRecipe(data) {
 // 保存某个工艺下的所有节点
 export function addProcessFlows(data) {
   return request({
-    url: 'process/process-flow-equipment/add',
+    url: '/api/process/process-flow-equipment/add',
     method: 'post',
     data
   })
@@ -102,7 +102,7 @@ export function addProcessFlows(data) {
 // 获取工艺流程下所有节点
 export function listProcessFlowNode(data) {
   return request({
-    url: '/process/process-flow-equipment/list',
+    url: '/api/process/process-flow-equipment/list',
     method: 'post',
     data
   })
@@ -111,7 +111,7 @@ export function listProcessFlowNode(data) {
 // 获取工序列表
 export function listProcess(data) {
   return request({
-    url: '/process/work-sequence/list',
+    url: '/api/process/work-sequence/list',
     method: 'post',
     data
   })
@@ -120,7 +120,7 @@ export function listProcess(data) {
 // 获取工艺自动code
 export function getCode() {
   return request({
-    url: '/process/process-flow/getCode',
+    url: '/api/process/process-flow/getCode',
     method: 'post'
   })
 }

src/api/art-manage/process.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-04-06 20:20:10
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-04-07 16:14:47
+ * @LastEditTime: 2022-02-25 09:04:24
  * @Description: file content
  */
 
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 
 export function list(data) {
   return request({
-    url: '/process/work-sequence/page',
+    url: '/api/process/work-sequence/page',
     method: 'post',
     data
   })
@@ -18,7 +18,7 @@ export function list(data) {
 
 export function getInfo(data) {
   return request({
-    url: '/process/work-sequence/get',
+    url: '/api/process/work-sequence/get',
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function getInfo(data) {
 
 export function del(data) {
   return request({
-    url: '/process/work-sequence/delete',
+    url: '/api/process/work-sequence/delete',
     method: 'post',
     data
   })
@@ -34,7 +34,7 @@ export function del(data) {
 
 export function update(data) {
   return request({
-    url: '/process/work-sequence/update',
+    url: '/api/process/work-sequence/update',
     method: 'post',
     data
   })
@@ -42,7 +42,7 @@ export function update(data) {
 
 export function add(data) {
   return request({
-    url: '/process/work-sequence/add',
+    url: '/api/process/work-sequence/add',
     method: 'post',
     data
   })

src/api/basicData/Cache/area.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-01-27 16:42:27
+ * @LastEditTime: 2022-01-11 16:16:07
  * @Description:
  */
 import request from '@/utils/request'
 
 export function areaList(data) { // 获取缓存区区域信息列表
   return request({
-    url: '/basic/area/page',
+    url: '/api/wms/area/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function areaList(data) { // 获取缓存区区域信息列表
 
 export function areaDetail(id) { // 获取缓存区区域信息单条数据
   return request({
-    url: '/basic/area/get',
+    url: '/api/wms/area/getById',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function areaDetail(id) { // 获取缓存区区域信息单条数据
 
 export function areaUpdate(data) { // 更新缓存区区域信息单条数据
   return request({
-    url: '/basic/area/update',
+    url: '/api/wms/area/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function areaUpdate(data) { // 更新缓存区区域信息单条数据
 
 export function areaAdd(data) { // 新增缓存区区域信息单条数据
   return request({
-    url: '/basic/area/add',
+    url: '/api/wms/area/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function areaAdd(data) { // 新增缓存区区域信息单条数据
 
 export function areaCode() { // 获取缓存区区域信息code
   return request({
-    url: '/basic/area/get-code',
+    url: '/api/wms/area/getCode',
     method: 'post'
   })
 }
 
 export function areaDelete(id) { // 删除缓存区区域信息单条数据
   return request({
-    url: '/basic/area/delete',
+    url: '/api/wms/area/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/Cache/cache.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-01-20 15:31:32
+ * @LastEditTime: 2022-01-11 15:50:42
  * @Description:
  */
 import request from '@/utils/request'
 
 export function cacheList(data) { // 获取缓存区信息列表
   return request({
-    url: '/basic/cache/page',
+    url: '/api/wms/area/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function cacheList(data) { // 获取缓存区信息列表
 
 export function cacheDetail(id) { // 获取缓存区信息单条数据
   return request({
-    url: '/basic/cache/get',
+    url: '/api/wms/area/getById',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function cacheDetail(id) { // 获取缓存区信息单条数据
 
 export function cacheUpdate(data) { // 更新缓存区信息单条数据
   return request({
-    url: '/basic/cache/update',
+    url: '/api/wms/area/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function cacheUpdate(data) { // 更新缓存区信息单条数据
 
 export function cacheAdd(data) { // 新增缓存区信息单条数据
   return request({
-    url: '/basic/cache/add',
+    url: '/api/wms/area/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function cacheAdd(data) { // 新增缓存区信息单条数据
 
 export function cacheCode() { // 获取缓存区信息code
   return request({
-    url: '/basic/cache/get-code',
+    url: '/api/wms/area/getCode',
     method: 'post'
   })
 }
 
 export function cacheDelete(id) { // 删除缓存区信息单条数据
   return request({
-    url: '/basic/cache/delete',
+    url: '/api/wms/area/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/Cache/location.js

@@ -1,15 +1,15 @@
 /*
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2021-01-28 09:38:31
+ * @LastEditTime: 2022-03-03 14:29:17
  * @Description:
  */
 import request from '@/utils/request'
 
 export function locationList(data) { // 获取库位信息列表
   return request({
-    url: '/basic/stock/page',
+    url: '/api/wms/area/locationByShelf',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function locationList(data) { // 获取库位信息列表
 
 export function locationDetail(id) { // 获取库位信息单条数据
   return request({
-    url: '/basic/stock/get',
+    url: '/api/wms/area/locationById',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function locationDetail(id) { // 获取库位信息单条数据
 
 export function locationUpdate(data) { // 更新库位信息单条数据
   return request({
-    url: '/basic/stock/update',
+    url: '/api/wms/area/updatelocation',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function locationUpdate(data) { // 更新库位信息单条数据
 
 export function locationAdd(data) { // 新增库位信息单条数据
   return request({
-    url: '/basic/stock/add',
+    url: '/api/wms/area/addlocation',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function locationAdd(data) { // 新增库位信息单条数据
 
 export function locationCode() { // 获取库位信息code
   return request({
-    url: '/basic/stock/get-code',
+    url: '/api/wms/area/getCode',
     method: 'post'
   })
 }
 
 export function locationDelete(id) { // 删除库位信息单条数据
   return request({
-    url: '/basic/stock/delete',
+    url: '/api/wms/area/deletelocation',
     method: 'post',
     data: { id }
   })

src/api/basicData/Cache/processLocation.js

@@ -0,0 +1,72 @@
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: fzq
+ * @Date: 2022-03-06 18:13:49
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-09 10:44:04
+ */
+import request from '@/utils/request'
+
+export function list(data) { // 获取工序库位信息列表
+  return request({
+    url: '/api/wms/processlocation/page',
+    method: 'post',
+    data
+  })
+}
+
+export function detail(id) { // 获取工序库位信息单条数据
+  return request({
+    url: '/api/wms/processlocation/getById',
+    method: 'post',
+    data: { id }
+  })
+}
+export function update(data) { // 更新工序库位信息单条数据
+  return request({
+    url: '/api/wms/processlocation/update',
+    method: 'post',
+    data
+  })
+}
+
+export function add(data) { // 手动绑定工序库位
+  return request({
+    url: '/api/wms/processlocation/add',
+    method: 'post',
+    data
+  })
+}
+
+export function locaDelete(id) { // 删除工序库位信息单条数据
+  return request({
+    url: '/api/wms/processlocation/delete',
+    method: 'post',
+    data: { id }
+  })
+}
+
+export function locationList(data) { // 获取库位id列表
+  return request({
+    url: '/api/wms/processlocation/locationList',
+    method: 'post',
+    data
+  })
+}
+
+export function portAttrList(data) { // 获取库位属性列表，关联数据字典
+  return request({
+    url: '/api/wms/processlocation/portAttrList',
+    method: 'post',
+    data
+  })
+}
+
+export function workSequenList(data) { // 获取工序id列表
+  return request({
+    url: '/api/wms/processlocation/workSequenList',
+    method: 'post',
+    data
+  })
+}

src/api/basicData/Cache/shelf.js

@@ -9,7 +9,7 @@ import request from '@/utils/request'
 
 export function shelfList(data) { // 获取货架信息列表
   return request({
-    url: '/basic/shelf/page',
+    url: '/api/wms/area/shelf',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function shelfList(data) { // 获取货架信息列表
 
 export function shelfDetail(id) { // 获取货架信息单条数据
   return request({
-    url: '/basic/shelf/get',
+    url: '/api/wms/area/shelfById',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,8 @@ export function shelfDetail(id) { // 获取货架信息单条数据
 
 export function shelfUpdate(data) { // 更新货架信息单条数据
   return request({
-    url: '/basic/shelf/update',
+    // url: '/basic/shelf/update',
+    url: '/api/wms/area/updateshelf',
     method: 'post',
     data
   })
@@ -33,7 +34,7 @@ export function shelfUpdate(data) { // 更新货架信息单条数据
 
 export function shelfAdd(data) { // 新增货架信息单条数据
   return request({
-    url: '/basic/shelf/add',
+    url: '/api/wms/area/addshelf',
     method: 'post',
     data
   })
@@ -41,14 +42,14 @@ export function shelfAdd(data) { // 新增货架信息单条数据
 
 export function shelfCode() { // 获取货架信息code
   return request({
-    url: '/basic/shelf/get-code',
+    url: '/api/wms/area/getCode',
     method: 'post'
   })
 }
 
 export function shelfDelete(id) { // 删除货架信息单条数据
   return request({
-    url: '/basic/shelf/delete',
+    url: '/api/wms/area/deleteshelf',
     method: 'post',
     data: { id }
   })

src/api/basicData/Cache/storageBox.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-07-21 14:29:10
+ * @LastEditTime: 2022-01-11 16:43:22
  * @Description:
  */
 import request from '@/utils/request'
 
 export function storageBoxList(data) { // 获取存储箱列表
   return request({
-    url: '/basic/storage-tank/page',
+    url: '/api/wms/storagebox/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function storageBoxList(data) { // 获取存储箱列表
 
 export function storageBoxDetail(id) { // 获取存储箱单条数据
   return request({
-    url: '/basic/storage-tank/get',
+    url: '/api/wms/storagebox/getById',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function storageBoxDetail(id) { // 获取存储箱单条数据
 
 export function storageBoxUpdate(data) { // 更新存储箱单条数据
   return request({
-    url: '/basic/storage-tank/update',
+    url: '/api/wms/storagebox/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function storageBoxUpdate(data) { // 更新存储箱单条数据
 
 export function storageBoxAdd(data) { // 新增存储箱单条数据
   return request({
-    url: '/basic/storage-tank/add',
+    url: '/api/wms/storagebox/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function storageBoxAdd(data) { // 新增存储箱单条数据
 
 export function storageBoxCode() { // 获取存储箱code
   return request({
-    url: '/basic/storage-tank/get-code',
+    url: '/api/wms/storagebox/getCode',
     method: 'post'
   })
 }
 
 export function storageBoxDelete(id) { // 删除存储箱单条数据
   return request({
-    url: '/basic/storage-tank/delete',
+    url: '/api/wms/storagebox/delete',
     method: 'post',
     data: { id }
   })
@@ -56,14 +56,14 @@ export function storageBoxDelete(id) { // 删除存储箱单条数据
 
 export function PositionDetailInfoAdd(data) { // 新增存储箱地址单条数据
   return request({
-    url: '/basic/storage-tank-site/add',
+    url: '/api/wms/storagebox/add',
     method: 'post',
     data
   })
 }
 export function PositionDetailInfoList(data) { // 获取存储箱地址列表
   return request({
-    url: '/basic/storage-tank-site/page',
+    url: '/api/wms/storagebox-site/page',
     method: 'post',
     data
   })

src/api/basicData/Equipment/equipmentGroup.js

@@ -10,7 +10,8 @@ import request from '@/utils/request'
 
 export function equipmentGroupList(data) { // 获取设备分组列表
   return request({
-    url: '/equipment/equipment-group/findAll',
+    // url: '/equipment/equipment-group/findAll',
+    url: '/api/wms/equipment/page',
     method: 'post',
     data
   })

src/api/basicData/Equipment/equipmentInfo.js

@@ -2,14 +2,22 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-03-12 09:40:01
+ * @LastEditTime: 2022-03-04 09:06:58
  * @Description:
  */
 import request from '@/utils/request'
 
 export function equipmentInfoList(data) { // 获取设备信息列表
   return request({
-    url: '/basic/equipment/page',
+    url: '/api/wms/equipment/page',
+    method: 'post',
+    data
+  })
+}
+
+export function equipmentlistList(data) { // 获取设备信息列表
+  return request({
+    url: '/api/process/work-sequence/equipmentlistList',
     method: 'post',
     data
   })
@@ -17,7 +25,7 @@ export function equipmentInfoList(data) { // 获取设备信息列表
 
 export function equipmentInfoDetail(id) { // 获取设备信息单条数据
   return request({
-    url: '/basic/equipment/get',
+    url: '/api/wms/equipment/get',
     method: 'post',
     data: { id }
   })
@@ -25,7 +33,7 @@ export function equipmentInfoDetail(id) { // 获取设备信息单条数据
 
 export function equipmentInfoUpdate(data) { // 更新设备信息单条数据
   return request({
-    url: '/basic/equipment/update',
+    url: '/api/wms/equipment/update',
     method: 'post',
     data
   })
@@ -33,7 +41,7 @@ export function equipmentInfoUpdate(data) { // 更新设备信息单条数据
 
 export function equipmentInfoAdd(data) { // 新增设备信息单条数据
   return request({
-    url: '/basic/equipment/add',
+    url: '/api/wms/equipment/add',
     method: 'post',
     data
   })
@@ -41,14 +49,14 @@ export function equipmentInfoAdd(data) { // 新增设备信息单条数据
 
 export function equipmentInfoCode() { // 获取设备信息code
   return request({
-    url: '/basic/equipment/get-code',
+    url: '/api/wms/equipment/getCode',
     method: 'post'
   })
 }
 
 export function equipmentInfoDelete(id) { // 删除设备信息单条数据
   return request({
-    url: '/basic/equipment/delete',
+    url: '/api/wms/equipment/delete',
     method: 'post',
     data: { id }
   })
@@ -56,7 +64,7 @@ export function equipmentInfoDelete(id) { // 删除设备信息单条数据
 
 export function equipmentInfoFileAdd(data) { // 设备信息上传
   return request({
-    url: '/basic/equipment-file/update-file',
+    url: '/api/wms/equipment-file/update-file',
     method: 'post',
     data
   })
@@ -64,8 +72,10 @@ export function equipmentInfoFileAdd(data) { // 设备信息上传
 
 export function getEquipmentInfoFile(data) { // 设备信息下载
   return request({
-    url: '/basic/equipment-file/get-by-param',
+    // url: '/api/wms/equipment-file/get-by-param',
-    method: 'post',
+    url: '/api/common/attachment/downloadFile',
+    // method: 'post',
+    method: 'get',
     data
   })
 }

src/api/basicData/Equipment/equipmentInfoAttr.js

@@ -1,15 +1,16 @@
 /*
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2021-01-20 12:00:52
+ * @LastEditTime: 2022-03-05 10:22:28
  * @Description:
  */
 import request from '@/utils/request'
 
 export function equipmentInfoAttrList(data) { // 获取设备属性列表
   return request({
-    url: '/basic/equipment-attr/page',
+    // url: '/basic/equipment-attr/page',
+    url: '/api/wms/equipment/attr',
     method: 'post',
     data
   })
@@ -17,7 +18,8 @@ export function equipmentInfoAttrList(data) { // 获取设备属性列表
 
 export function equipmentInfoAttrDetail(id) { // 获取设备属性单条数据
   return request({
-    url: '/basic/equipment-attr/get',
+    // url: '/basic/equipment-attr/get',
+    url: '/api/wms/equipment/attrById',
     method: 'post',
     data: { id }
   })
@@ -25,7 +27,7 @@ export function equipmentInfoAttrDetail(id) { // 获取设备属性单条数据
 
 export function equipmentInfoAttrUpdate(data) { // 更新设备属性单条数据
   return request({
-    url: '/basic/equipment-attr/update',
+    url: '/api/wms/equipment/updateattr',
     method: 'post',
     data
   })
@@ -33,7 +35,7 @@ export function equipmentInfoAttrUpdate(data) { // 更新设备属性单条数
 
 export function equipmentInfoAttrAdd(data) { // 新增设备属性单条数据
   return request({
-    url: '/basic/equipment-attr/add',
+    url: '/api/wms/equipment/addattr',
     method: 'post',
     data
   })
@@ -41,14 +43,14 @@ export function equipmentInfoAttrAdd(data) { // 新增设备属性单条数据
 
 export function equipmentInfoAttrCode() { // 获取设备属性code
   return request({
-    url: '/basic/equipment-attr/get-code',
+    url: '/api/wms/equipment/getCode',
     method: 'post'
   })
 }
 
 export function equipmentInfoAttrDelete(id) { // 删除设备属性单条数据
   return request({
-    url: '/basic/equipment-attr/delete',
+    url: '/api/wms/equipment/deleteattr',
     method: 'post',
     data: { id }
   })

src/api/basicData/Equipment/equipmentType.js

@@ -9,7 +9,8 @@ import request from '@/utils/request'
 
 export function equipmentTypeList(data) { // 获取设备类型列表
   return request({
-    url: '/basic/equipment-type/page',
+    // url: '/basic/equipment-type/page',
+    url: '/api/wms/equipment/page',
     method: 'post',
     data
   })

src/api/basicData/EquipmentScrapGrade.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-07-06 11:10:22
+ * @LastEditTime: 2022-03-03 13:46:55
  * @Description:
  */
 import request from '@/utils/request'
 
 export function EquipmentScrapGradeList(data) { // 获取废片等级列表
   return request({
-    url: '/basic/equipment-scraps-grade/pageForEquipmentGrade',
+    url: '/api/wms/equipment-scraps-grade/pageForEquipmentGrade',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function EquipmentScrapGradeList(data) { // 获取废片等级列表
 
 export function EquipmentScrapGradeDetail(id) { // 获取废片等级单条数据
   return request({
-    url: '/basic/equipment-scraps-grade/get',
+    url: '/api/wms/equipment-scraps-grade/get',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function EquipmentScrapGradeDetail(id) { // 获取废片等级单条数
 
 export function EquipmentScrapGradeUpdate(data) { // 更新废片等级单条数据
   return request({
-    url: '/basic/equipment-scraps-grade/update',
+    url: '/api/wms/equipment-scraps-grade/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function EquipmentScrapGradeUpdate(data) { // 更新废片等级单条数
 
 export function EquipmentScrapGradeAdd(data) { // 新增废片等级单条数据
   return request({
-    url: '/basic/equipment-scraps-grade/add',
+    url: '/api/wms/equipment-scraps-grade/add',
     method: 'post',
     data
   })
@@ -41,7 +41,7 @@ export function EquipmentScrapGradeAdd(data) { // 新增废片等级单条数据
 
 export function EquipmentScrapGradeDelete(id) { // 删除废片等级单条数据
   return request({
-    url: '/basic/equipment-scraps-grade/delete',
+    url: '/api/wms/equipment-scraps-grade/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/GroupModule/staff.js

@@ -1,15 +1,15 @@
 /*
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-04-17 16:04:51
+ * @LastEditTime: 2022-03-04 10:05:02
  * @Description:
  */
 import request from '@/utils/request'
 
 export function staffList(data) { // 获取员工列表
   return request({
-    url: '/basic/worker/page',
+    url: '/api/wms/worker/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function staffList(data) { // 获取员工列表
 
 export function staffDetail(id) { // 获取员工单条数据
   return request({
-    url: '/basic/worker/get',
+    url: '/api/wms/worker/get',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function staffDetail(id) { // 获取员工单条数据
 
 export function staffUpdate(data) { // 更新员工单条数据
   return request({
-    url: '/basic/worker/update',
+    url: '/api/wms/worker/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function staffUpdate(data) { // 更新员工单条数据
 
 export function staffAdd(data) { // 新增员工单条数据
   return request({
-    url: '/basic/worker/add',
+    url: '/api/wms/worker/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function staffAdd(data) { // 新增员工单条数据
 
 export function staffCode() { // 获取员工code
   return request({
-    url: '/basic/worker/get-code',
+    url: '/api/wms/worker/get-code',
     method: 'post'
   })
 }
 
 export function staffDelete(id) { // 删除员工单条数据
   return request({
-    url: '/basic/worker/delete',
+    url: '/api/wms/worker/delete',
     method: 'post',
     data: { id }
   })
@@ -56,7 +56,7 @@ export function staffDelete(id) { // 删除员工单条数据
 
 export function workerList(data) { // 添加组员列表
   return request({
-    url: '/basic/team-det/workerList',
+    url: '/api/wms/team-det/workerList',
     method: 'post',
     data
   })
@@ -64,7 +64,7 @@ export function workerList(data) { // 添加组员列表
 
 export function getRoleList() {
   return request({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
     method: 'post',
     data: {
       dictTypeId: '1383318968677273601',

src/api/basicData/Materials/material.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-01-15 16:03:31
+ * @LastEditTime: 2022-02-24 08:57:40
  * @Description:
  */
 import request from '@/utils/request'
 
 export function materialList(data) { // 获取物料信息列表
   return request({
-    url: '/basic/material/page',
+    url: '/api/wms/material/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function materialList(data) { // 获取物料信息列表
 
 export function materialDetail(id) { // 获取物料信息单条数据
   return request({
-    url: '/basic/material/get',
+    url: '/api/wms/material/get',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function materialDetail(id) { // 获取物料信息单条数据
 
 export function materialUpdate(data) { // 更新物料信息单条数据
   return request({
-    url: '/basic/material/update',
+    url: '/api/wms/material/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function materialUpdate(data) { // 更新物料信息单条数据
 
 export function materialAdd(data) { // 新增物料信息单条数据
   return request({
-    url: '/basic/material/add',
+    url: '/api/wms/material/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function materialAdd(data) { // 新增物料信息单条数据
 
 export function materialCode() { // 获取物料信息code
   return request({
-    url: '/basic/material/get-code',
+    url: '/api/wms/material/get-code',
     method: 'post'
   })
 }
 
 export function materialDelete(id) { // 删除物料信息单条数据
   return request({
-    url: '/basic/material/delete',
+    url: '/api/wms/material/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/Materials/materialAttr.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-01-16 12:09:29
+ * @LastEditTime: 2022-02-24 14:46:16
  * @Description:
  */
 import request from '@/utils/request'
 
 export function materialAttrList(data) { // 获取物料属性列表
   return request({
-    url: '/basic/material-attr/page',
+    url: '/api/wms/material-attr/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function materialAttrList(data) { // 获取物料属性列表
 
 export function materialAttrDetail(id) { // 获取物料属性单条数据
   return request({
-    url: '/basic/material-attr/get',
+    url: '/api/wms/material-attr/get',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function materialAttrDetail(id) { // 获取物料属性单条数据
 
 export function materialAttrUpdate(data) { // 更新物料属性单条数据
   return request({
-    url: '/basic/material-attr/update',
+    url: '/api/wms/material-attr/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function materialAttrUpdate(data) { // 更新物料属性单条数据
 
 export function materialAttrAdd(data) { // 新增物料属性单条数据
   return request({
-    url: '/basic/material-attr/add',
+    url: '/api/wms/material-attr/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function materialAttrAdd(data) { // 新增物料属性单条数据
 
 export function materialAttrCode() { // 获取物料属性code
   return request({
-    url: '/basic/material-attr/get-code',
+    url: '/api/wms/material-attr/get-code',
     method: 'post'
   })
 }
 
 export function materialAttrDelete(id) { // 删除物料属性单条数据
   return request({
-    url: '/basic/material-attr/delete',
+    url: '/api/wms/material-attr/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/Materials/materialsType.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-01-16 11:52:14
+ * @LastEditTime: 2022-02-24 14:46:20
  * @Description:
  */
 import request from '@/utils/request'
 
 export function materialsTypeList(data) { // 获取物料类型列表
   return request({
-    url: '/basic/material-type/page',
+    url: '/api/wms/material-type/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function materialsTypeList(data) { // 获取物料类型列表
 
 export function materialsTypeDetail(id) { // 获取物料类型单条数据
   return request({
-    url: '/basic/material-type/get',
+    url: '/api/wms/material-type/get',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function materialsTypeDetail(id) { // 获取物料类型单条数据
 
 export function materialsTypeUpdate(data) { // 更新物料类型单条数据
   return request({
-    url: '/basic/material-type/update',
+    url: '/api/wms/material-type/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function materialsTypeUpdate(data) { // 更新物料类型单条数据
 
 export function materialsTypeAdd(data) { // 新增物料类型单条数据
   return request({
-    url: '/basic/material-type/add',
+    url: '/api/wms/material-type/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function materialsTypeAdd(data) { // 新增物料类型单条数据
 
 export function materialsTypeCode() { // 获取物料类型code
   return request({
-    url: '/basic/material-type/get-code',
+    url: '/api/wms/material-type/get-code',
     method: 'post'
   })
 }
 
 export function materialsTypeDelete(id) { // 删除物料类型单条数据
   return request({
-    url: '/basic/material-type/delete',
+    url: '/api/wms/material-type/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/Scrap/ScrapInfo.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-03-10 14:25:18
+ * @LastEditTime: 2022-03-03 13:46:40
  * @Description:
  */
 import request from '@/utils/request'
 
 export function scrapInfoList(data) { // 获取报废信息列表
   return request({
-    url: '/basic/scrap-information/page',
+    url: '/api/wms/scrap-information/page',
     method: 'post',
     data
   })
@@ -20,7 +20,7 @@ export function scrapInfoDetail(id) { // 获取报废信息单条数据
     'id': id
   }
   return request({
-    url: '/basic/scrap-information/get',
+    url: '/api/wms/scrap-information/get',
     method: 'post',
     data
   })
@@ -28,7 +28,7 @@ export function scrapInfoDetail(id) { // 获取报废信息单条数据
 
 export function scrapInfoUpdate(data) { // 更新报废信息单条数据
   return request({
-    url: '/basic/scrap-information/update',
+    url: '/api/wms/scrap-information/update',
     method: 'post',
     data
   })
@@ -36,7 +36,7 @@ export function scrapInfoUpdate(data) { // 更新报废信息单条数据
 
 export function scrapInfoAdd(data) { // 新增报废信息单条数据
   return request({
-    url: '/basic/scrap-information/add',
+    url: '/api/wms/scrap-information/add',
     method: 'post',
     data
   })
@@ -44,14 +44,14 @@ export function scrapInfoAdd(data) { // 新增报废信息单条数据
 
 export function scrapInfoCode() { // 获取报废信息code
   return request({
-    url: '/basic/scrap-information/get-code',
+    url: '/api/wms/scrap-information/get-code',
     method: 'post'
   })
 }
 
 export function scrapInfoDelete(id) { // 删除报废信息单条数据
   return request({
-    url: '/basic/scrap-information/delete',
+    url: '/api/wms/scrap-information/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/Scrap/ScrapType.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-03-10 14:25:59
+ * @LastEditTime: 2022-03-03 13:46:46
  * @Description:
  */
 import request from '@/utils/request'
 
 export function scrapTypeList(data) { // 获取报废类型列表
   return request({
-    url: '/basic/scrap-type-information/page',
+    url: '/api/wms/scrap-type-information/page',
     method: 'post',
     data
   })
@@ -20,7 +20,7 @@ export function scrapTypeDetail(id) { // 获取报废类型单条数据
     'id': id
   }
   return request({
-    url: '/basic/scrap-type-information/get',
+    url: '/api/wms/scrap-type-information/get',
     method: 'post',
     data
   })
@@ -28,7 +28,7 @@ export function scrapTypeDetail(id) { // 获取报废类型单条数据
 
 export function scrapTypeUpdate(data) { // 更新报废类型单条数据
   return request({
-    url: '/basic/scrap-type-information/update',
+    url: '/api/wms/scrap-type-information/update',
     method: 'post',
     data
   })
@@ -36,7 +36,7 @@ export function scrapTypeUpdate(data) { // 更新报废类型单条数据
 
 export function scrapTypeAdd(data) { // 新增报废类型单条数据
   return request({
-    url: '/basic/scrap-type-information/add',
+    url: '/api/wms/scrap-type-information/add',
     method: 'post',
     data
   })
@@ -44,14 +44,14 @@ export function scrapTypeAdd(data) { // 新增报废类型单条数据
 
 export function scrapTypeCode() { // 获取报废类型code
   return request({
-    url: '/basic/scrap-type-information/get-code',
+    url: '/api/wms/scrap-type-information/get-code',
     method: 'post'
   })
 }
 
 export function scrapTypeDelete(id) { // 删除报废类型单条数据
   return request({
-    url: '/basic/scrap-type-information/delete',
+    url: '/api/wms/scrap-type-information/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/StateConfig.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-01-13 16:11:45
+ * @LastEditTime: 2022-03-03 16:10:54
  * @Description:
  */
 import request from '@/utils/request'
 
 export function StateConfigList(data) { // 获取状态列表
   return request({
-    url: '/basic/configure-display/page',
+    url: '/api/wms/configure-display/page',
     method: 'post',
     data
   })

src/api/basicData/Warehouse/HistoricalTask.js

@@ -0,0 +1,46 @@
+/*
+ * @Author: zwq
+ * @Date: 2020-12-29 16:00:14
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-01-14 15:29:26
+ * @Description:
+ */
+import request from '@/utils/request'
+
+export function HistoricalTaskList(data) { // 获取任务列表
+  return request({
+    url: '/api/wms/car/task/execution/info/his/page',
+    method: 'post',
+    data
+  })
+}
+
+export function HistoricalTaskDetail(id) { // 获取任务单条数据
+  const data = {
+    'id': id
+  }
+  return request({
+    url: '/api/wms/car/task/execution/info/his/get',
+    method: 'post',
+    data
+  })
+}
+
+export function CurrentTaskList(data) { // 获取任务列表
+  return request({
+    url: '/api/wms/car/task/execution/info/page',
+    method: 'post',
+    data
+  })
+}
+
+export function CurrentTaskDetail(id) { // 获取任务单条数据
+  const data = {
+    'id': id
+  }
+  return request({
+    url: '/api/wms/car/task/execution/info/get',
+    method: 'post',
+    data
+  })
+}

src/api/basicData/Warehouse/StorageBoxInfo.js

@@ -0,0 +1,102 @@
+/*
+ * @Author: zwq
+ * @Date: 2020-12-29 16:00:14
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-11 16:23:43
+ * @Description:
+ */
+import request from '@/utils/request'
+
+export function StorageBoxInfoList(data) { // 获取存储箱使用情况
+  return request({
+    url: '/api/wms/storage/box/circ/info/his/page/by/code',
+    method: 'post',
+    data
+  })
+}
+
+export function StorageBoxInfoDetail(id) { // 获取存储箱单条数据
+  const data = {
+    'id': id
+  }
+  return request({
+    url: '/api/wms/storage/box/get',
+    method: 'post',
+    data
+  })
+}
+
+export function StorageBoxRackList(data) { // 获取存储箱上架列表
+  return request({
+    url: '/api/wms/storage/box/circ/info/page/for/bind',
+    method: 'post',
+    data
+  })
+}
+
+export function locationList(data) { // 获取库位列表
+  return request({
+    url: '/api/wms/location/list',
+    method: 'post',
+    data
+  })
+}
+
+export function StorageBoxRackDetail(id) { // 获取存储箱上架单条数据
+  const data = {
+    'id': id
+  }
+  return request({
+    url: '/api/wms/storage/box/circ/info/get',
+    method: 'post',
+    data
+  })
+}
+
+export function StorageBoxRackUpdate(data) { // 更新存储箱上架单条数据
+  return request({
+    url: '/api/wms/storage/box/circ/info/update',
+    method: 'post',
+    data
+  })
+}
+
+export function StorageBoxRackAdd(data) { // 新增存储箱上架单条数据
+  return request({
+    url: '/api/wms/storage/box/circ/info/add',
+    method: 'post',
+    data
+  })
+}
+
+export function StorageBoxRackCode(data) { // 获取存储箱上架code
+  return request({
+    url: '/api/wms/storagebox/page',
+    method: 'post',
+    data
+  })
+}
+
+export function StorageBoxRackDelete(id) { // 删除存储箱上架单条数据
+  return request({
+    url: '/api/wms/storage/box/circ/info/delete',
+    method: 'post',
+    data: { id }
+  })
+}
+
+export function batchListAdd(data) { // 新增工序库位关联
+  return request({
+    url: '/api/wms/processlocation/batchList',
+    method: 'post',
+    data
+  })
+}
+
+export function locationByProcessList(data) { // 工序库位列表获取
+  return request({
+    url: '/api/wms/processlocation/locationByProcess',
+    method: 'post',
+    data
+  })
+}

src/api/basicData/dataDictionary.js

@@ -1,15 +1,15 @@
 /*
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-05-19 15:57:56
+ * @LastEditTime: 2022-03-03 15:10:16
  * @Description:
  */
 import request from '@/utils/request'
 
 export function dataDictionaryDataList(data) { // 获取字典类型列表
   return request({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function dataDictionaryDataList(data) { // 获取字典类型列表
 
 export function dataDictionaryDataDetail(id) { // 获取字典类型单条数据
   return request({
-    url: '/basic/platform-dict/selectPlatformDictDataById',
+    url: '/api/wms/platform-dict/selectPlatformDictDataById',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function dataDictionaryDataDetail(id) { // 获取字典类型单条数据
 
 export function dataDictionaryDataUpdate(data) { // 更新字典类型单条数据
   return request({
-    url: '/basic/platform-dict/updatePlatformDictData',
+    url: '/api/wms/platform-dict/updatePlatformDictData',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function dataDictionaryDataUpdate(data) { // 更新字典类型单条数
 
 export function dataDictionaryDataAdd(data) { // 新增字典类型单条数据
   return request({
-    url: '/basic/platform-dict/savePlatformDictData',
+    url: '/api/wms/platform-dict/savePlatformDictData',
     method: 'post',
     data
   })
@@ -41,7 +41,7 @@ export function dataDictionaryDataAdd(data) { // 新增字典类型单条数据
 
 export function dataDictionaryDataDelete(id) { // 删除字典类型单条数据
   return request({
-    url: '/basic/platform-dict/deletePlatformDictData',
+    url: '/api/wms/platform-dict/deletePlatformDictData',
     method: 'post',
     data: { id }
   })

src/api/basicData/dataDictionaryType.js

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
  * @LastEditors: zwq
- * @LastEditTime: 2021-04-16 12:51:29
+ * @LastEditTime: 2022-03-03 15:29:30
  * @Description:
  */
 import request from '@/utils/request'
 
 export function dataDictionaryTypeList(data) { // 获取字典类型列表
   return request({
-    url: '/basic/platform-dict/selectPlatformDictTypeListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictTypeListByPage',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function dataDictionaryTypeList(data) { // 获取字典类型列表
 
 export function dataDictionaryTypeDetail(id) { // 获取字典类型单条数据
   return request({
-    url: '/basic/platform-dict/selectDictTypeById',
+    url: '/api/wms/platform-dict/selectDictTypeById',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function dataDictionaryTypeDetail(id) { // 获取字典类型单条数据
 
 export function dataDictionaryTypeUpdate(data) { // 更新字典类型单条数据
   return request({
-    url: '/basic/platform-dict/updatePlatformDictType',
+    url: '/api/wms/platform-dict/updatePlatformDictType',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function dataDictionaryTypeUpdate(data) { // 更新字典类型单条数
 
 export function dataDictionaryTypeAdd(data) { // 新增字典类型单条数据
   return request({
-    url: '/basic/platform-dict/savePlatformDictType',
+    url: '/api/wms/platform-dict/savePlatformDictType',
     method: 'post',
     data
   })
@@ -41,7 +41,7 @@ export function dataDictionaryTypeAdd(data) { // 新增字典类型单条数据
 
 export function dataDictionaryTypeDelete(id) { // 删除字典类型单条数据
   return request({
-    url: '/basic/platform-dict/deletePlatformDictType',
+    url: '/api/wms/platform-dict/deletePlatformDictType',
     method: 'post',
     data: { id }
   })

src/api/dashboard.js

@@ -0,0 +1,27 @@
+/*
+ * @Author: gtz
+ * @Date: 2022-03-16 16:08:06
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-16 16:45:41
+ * @Description: file content
+ * @FilePath: \mt-ck-wms-ui\src\api\dashboard.js
+ */
+import request from '@/utils/request'
+
+// 获取菜单列表
+export function getPortList(data) {
+  return request({
+    url: '/api/wms/location/shelfList',
+    method: 'post',
+    data
+  })
+}
+
+// 获取菜单详情
+export function getPortDetail(id) {
+  return request({
+    url: '/api/wms/storage/box/circ/info/getByLocationId',
+    method: 'post',
+    data: { id }
+  })
+}

src/api/dict/index.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-01-21 18:08:29
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-12 10:11:14
+ * @LastEditTime: 2022-02-24 14:55:06
  * @FilePath: \basic-admin\src\api\dict\index.js
  * @Description: 数据字典定义
  */
@@ -11,7 +11,7 @@ import { requestWithCache } from '@/utils/request'
 // 获取设备列表列表
 export function getDictDevice(data) {
   return requestWithCache({
-    url: '/basic/equipment/page',
+    url: '/api/wms/equipment/page',
     method: 'post',
     data
   }).then(res => {
@@ -41,7 +41,7 @@ export function getDictDeviceType(data) {
 // 获取物料列表
 export function getDictBom(data) {
   return requestWithCache({
-    url: '/basic/material/page',
+    url: '/api/wms/material/page',
     method: 'post',
     data
   }).then(res => {
@@ -71,7 +71,7 @@ export function getDictSupplier(data) {
 // 获取单位列表
 export function getDictUnit(data) {
   return requestWithCache({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
     method: 'post',
     data: {
       current: 1,
@@ -105,7 +105,7 @@ export function getDictMaterial(data) {
 // 获取维修类型
 export function getDictRepairType(data) {
   return requestWithCache({
-    url: '/basic/maintenance-type/page',
+    url: '/api/wms/maintenance-type/page',
     method: 'post',
     data: {
       current: 1,
@@ -129,7 +129,7 @@ export function getDictRepairType(data) {
 // 获取员工列表
 export function getDictWorker() {
   return requestWithCache({
-    url: '/basic/worker/page',
+    url: '/api/wms/worker/page',
     method: 'post',
     data: {
       current: 1,
@@ -153,7 +153,7 @@ export function getDictWorker() {
 // 获取基础备品备件列表
 export function getDictSparepart(data) {
   return requestWithCache({
-    url: '/basic/tool-spare-part/page',
+    url: '/api/wms/tool-spare-part/page',
     method: 'post',
     data: {
       current: 1,
@@ -176,7 +176,7 @@ export function getDictSparepart(data) {
 // 获取备件型号
 export function getDictModel(data) {
   return requestWithCache({
-    url: '/basic/tool-spare-part/list',
+    url: '/api/wms/tool-spare-part/list',
     method: 'post',
     data: {
       current: 1,
@@ -200,7 +200,7 @@ export function getDictModel(data) {
 // 质量---报废： 报废原因
 export function scrapReasonList(data) {
   return requestWithCache({
-    url: '/basic/scrap-information/page',
+    url: '/api/wms/scrap-information/page',
     method: 'post',
     data: {
       current: 1,
@@ -250,7 +250,7 @@ export function faultLevelList(data) {
 // 获取保养周期
 export function maintainPeriod(data) {
   return requestWithCache({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
     method: 'post',
     data: {
       current: 1,
@@ -327,7 +327,7 @@ export function equipmentTypeParam(id) {
 
 export function statusList(id) {
   return requestWithCache({
-    url: '/basic/configure-display/page',
+    url: '/api/wms/configure-display/page',
     method: 'post',
     data: {
       current: 1,
@@ -350,7 +350,7 @@ export function statusList(id) {
 // 获取角色列表
 export function workerRoleList() {
   return requestWithCache({
-    url: '/basic/platform-dict/selectPlatformDictDataListByPage',
+    url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
     method: 'post',
     data: {
       dictTypeId: '1383318968677273601',

src/api/equipment/bom.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-01-05 15:25:38
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-04-21 13:26:36
+ * @LastEditTime: 2022-02-24 14:48:53
  * @FilePath: \basic-admin\src\api\equipment\bom.js
  * @Description: 设备管理——设备物料bom管理 接口定义
  */
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取物料bom列表
 export function getBOMList(data) {
   return request({
-    url: '/equipment/equipment-bom/findAllByEQNameOrEQCodeOrMaterialNameWithPage',
+    url: '/api/wms/equipment-bom/findAllByEQNameOrEQCodeOrMaterialNameWithPage',
     method: 'post',
     data
   })
@@ -19,7 +19,7 @@ export function getBOMList(data) {
 // 新增物料bom
 export function addBOM(data) {
   return request({
-    url: '/equipment/equipment-bom/create',
+    url: '/api/wms/equipment-bom/create',
     method: 'post',
     data
   })
@@ -28,7 +28,7 @@ export function addBOM(data) {
 // 修改物料bom
 export function editBOM(data) {
   return request({
-    url: '/equipment/equipment-bom/update',
+    url: '/api/wms/equipment-bom/update',
     method: 'post',
     data
   })
@@ -37,7 +37,7 @@ export function editBOM(data) {
 // 删除物料bom
 export function delBOM(data) {
   return request({
-    url: '/equipment/equipment-bom/delete',
+    url: '/api/wms/equipment-bom/delete',
     method: 'post',
     data
   })
@@ -46,7 +46,7 @@ export function delBOM(data) {
 // 根据id获取物料bom
 export function getBOMInfo(data) {
   return request({
-    url: '/equipment/equipment-bom/findById',
+    url: '/api/wms/equipment-bom/findById',
     method: 'post',
     data
   })
@@ -55,7 +55,7 @@ export function getBOMInfo(data) {
 // 获取设备物料bom列表
 export function getDeviceBOMList(data) {
   return request({
-    url: '/equipment/equipment-bom-detail/findAllByEQBomIdWithPage',
+    url: '/api/wms/equipment-bom-detail/findAllByEQBomIdWithPage',
     method: 'post',
     data
   })
@@ -64,7 +64,7 @@ export function getDeviceBOMList(data) {
 // 新增设备物料bom
 export function addDeviceBOM(data) {
   return request({
-    url: '/equipment/equipment-bom-detail/create',
+    url: '/api/wms/equipment-bom-detail/create',
     method: 'post',
     data
   })
@@ -73,7 +73,7 @@ export function addDeviceBOM(data) {
 // 修改设备物料bom
 export function editDeviceBOM(data) {
   return request({
-    url: '/equipment/equipment-bom-detail/update',
+    url: '/api/wms/equipment-bom-detail/update',
     method: 'post',
     data
   })
@@ -82,7 +82,7 @@ export function editDeviceBOM(data) {
 // 删除设备物料bom
 export function delDeviceBOM(data) {
   return request({
-    url: '/equipment/equipment-bom-detail/delete',
+    url: '/api/wms/equipment-bom-detail/delete',
     method: 'post',
     data
   })
@@ -91,7 +91,7 @@ export function delDeviceBOM(data) {
 // 根据id获取设备物料bom详细
 export function getDeviceBOMInfo(data) {
   return request({
-    url: '/equipment/equipment-bom-detail/findById',
+    url: '/api/wms/equipment-bom-detail/findById',
     method: 'post',
     data
   })
@@ -101,7 +101,7 @@ export function getDeviceBOMInfo(data) {
 
 export function getMaterialList(data) {
   return request({
-    url: '/basic/material/page',
+    url: '/api/wms/material/page',
     method: 'post',
     data
   })

src/api/equipment/maintain.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-01-15 17:42:07
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-12 10:31:01
+ * @LastEditTime: 2022-03-03 13:52:50
  * @FilePath: \basic-admin\src\api\equipment\maintain.js
  * @Description: 保养计划 & 保养记录 接口定义
  */
@@ -109,7 +109,7 @@ export function getMaintainLog(data) {
 // 获取设备列表
 export function getEqList(data) {
   return request({
-    url: '/basic/equipment/page',
+    url: '/api/wms/equipment/page',
     method: 'post',
     data
   })

src/api/equipment/recipe.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-01-28 15:01:57
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-04-20 10:50:48
+ * @LastEditTime: 2022-02-24 14:49:42
  * @FilePath: \basic-admin\src\api\equipment\recipe.js
  * @Description: 设备配方设置
  */
@@ -11,7 +11,7 @@ import request from '@/utils/request'
 // 获取设备配方CODE
 export function getDeviceRecipeCode(data) {
   return request({
-    url: '/equipment/equipment-recipe/getEquipmentRecipeCode',
+    url: '/api/wms/equipment-recipe/getEquipmentRecipeCode',
     method: 'post',
     data
   })
@@ -20,7 +20,7 @@ export function getDeviceRecipeCode(data) {
 // 获取设备配方列表
 export function getDeviceRecipeList(data) {
   return request({
-    url: '/equipment/equipment-recipe/findAllByEquipmentTypeAndRecipeName',
+    url: '/api/wms/equipment-recipe/findAllByEquipmentTypeAndRecipeName',
     method: 'post',
     data
   })
@@ -29,7 +29,7 @@ export function getDeviceRecipeList(data) {
 // 新建设备配方
 export function addDeviceRecipe(data) {
   return request({
-    url: '/equipment/equipment-recipe/create',
+    url: '/api/wms/equipment-recipe/create',
     method: 'post',
     data
   })
@@ -38,7 +38,7 @@ export function addDeviceRecipe(data) {
 // 编辑设备配方
 export function editDeviceRecipe(data) {
   return request({
-    url: '/equipment/equipment-recipe/update',
+    url: '/api/wms/equipment-recipe/update',
     method: 'post',
     data
   })
@@ -47,7 +47,7 @@ export function editDeviceRecipe(data) {
 // 删除设备配方
 export function delDeviceRecipe(data) {
   return request({
-    url: '/equipment/equipment-recipe/delete',
+    url: '/api/wms/equipment-recipe/delete',
     method: 'post',
     data
   })
@@ -56,7 +56,7 @@ export function delDeviceRecipe(data) {
 // 获取设备配方
 export function getDeviceRecipe(data) {
   return request({
-    url: '/equipment/equipment-recipe/findById',
+    url: '/api/wms/equipment-recipe/findById',
     method: 'post',
     data
   })
@@ -65,7 +65,7 @@ export function getDeviceRecipe(data) {
 // 根据id获取设备配方参数列表
 export function getDeviceRecipeParamList(data) {
   return request({
-    url: '/equipment/equipment-recipe-parameter/findAllByRecipeIdWithPage',
+    url: '/api/wms/equipment-recipe-parameter/findAllByRecipeIdWithPage',
     method: 'post',
     data
   })
@@ -74,7 +74,7 @@ export function getDeviceRecipeParamList(data) {
 // 新增设备配方参数
 export function addDeviceRecipeParam(data) {
   return request({
-    url: '/equipment/equipment-recipe-parameter/create',
+    url: '/api/wms/equipment-recipe-parameter/create',
     method: 'post',
     data
   })
@@ -83,7 +83,7 @@ export function addDeviceRecipeParam(data) {
 // 修改设备配方参数
 export function editDeviceRecipeParam(data) {
   return request({
-    url: '/equipment/equipment-recipe-parameter/update',
+    url: '/api/wms/equipment-recipe-parameter/update',
     method: 'post',
     data
   })
@@ -92,7 +92,7 @@ export function editDeviceRecipeParam(data) {
 // 删除设备配方参数
 export function delDeviceRecipeParam(data) {
   return request({
-    url: '/equipment/equipment-recipe-parameter/delete',
+    url: '/api/wms/equipment-recipe-parameter/delete',
     method: 'post',
     data
   })
@@ -101,7 +101,7 @@ export function delDeviceRecipeParam(data) {
 // 获取设备配方参数详细 (等待接口补全)
 export function getDeviceRecipeParam(data) {
   return request({
-    url: '/equipment/equipment-recipe-parameter/findById',
+    url: '/api/wms/equipment-recipe-parameter/findById',
     method: 'post',
     data
   })

src/api/material-manage/material.js

@@ -1,15 +1,22 @@
+/*
+ * @Author: zwq
+ * @Date: 2021-09-18 16:09:07
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 09:52:41
+ * @Description:
+ */
 import request from '@/utils/request'
 
 export function list(data) {
   return request({
-    url: 'material/material-date/materialList',
+    url: 'api/process/process-flow-equipment/equipmentList',
     method: 'post',
     data
   })
 }
 export function listEquipment(data) {
   return request({
-    url: 'material/equipment-material-replace/equipmentList',
+    url: 'api/process/process-flow-equipment/equipmentList',
     method: 'post',
     data
   })

src/api/menu.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-28 20:46:53
  * @LastEditors: zwq
- * @LastEditTime: 2021-04-25 14:52:11
+ * @LastEditTime: 2022-03-11 09:16:13
  * @FilePath: \basic-admin\src\api\menu.js
  * @Description: 菜单api接口定义
  */
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取菜单列表
 export function getMenuList(data) {
   return request({
-    url: '/upms/menu/list',
+    url: '/api/upms/menu/list',
     method: 'post',
     data
   })
@@ -19,7 +19,7 @@ export function getMenuList(data) {
 // 获取菜单详情
 export function getMenuDetail(id) {
   return request({
-    url: '/upms/menu/get',
+    url: '/api/upms/menu/get',
     method: 'post',
     data: { id }
   })
@@ -28,7 +28,7 @@ export function getMenuDetail(id) {
 // 新增菜单
 export function addMenu(data) {
   return request({
-    url: '/upms/menu/add',
+    url: '/api/upms/menu/add',
     method: 'post',
     data
   })
@@ -37,7 +37,7 @@ export function addMenu(data) {
 // 删除菜单
 export function delMenu(id) {
   return request({
-    url: '/upms/menu/delete',
+    url: '/api/upms/menu/delete',
     method: 'post',
     data: { id }
   })
@@ -46,7 +46,7 @@ export function delMenu(id) {
 // 启停菜单
 export function enableMenu(data) {
   return request({
-    url: '/upms/menu/enabled',
+    url: '/api/upms/menu/enabled',
     method: 'post',
     data
   })
@@ -55,7 +55,7 @@ export function enableMenu(data) {
 // 修改菜单
 export function editMenu(data) {
   return request({
-    url: '/upms/menu/update',
+    url: '/api/upms/menu/update',
     method: 'post',
     data
   })
@@ -64,7 +64,7 @@ export function editMenu(data) {
 // 菜单-角色关联授权
 export function saveRoleMenu(data) {
   return request({
-    url: '/upms/menu/saveRoleMenu',
+    url: '/api/upms/menu/saveRoleMenu',
     method: 'post',
     data
   })
@@ -73,7 +73,7 @@ export function saveRoleMenu(data) {
 // 菜单-角色关联获取
 export function listByRole(id) {
   return request({
-    url: '/upms/menu/listByRole',
+    url: '/api/upms/menu/listByRole',
     method: 'post',
     data: { id }
   })

src/api/orderManage/00A.js

@@ -0,0 +1,55 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-01-17 14:55:09
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-10 14:13:22
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+export function ProcessInfoList(data) { // 获取工单工艺列表
+  return request({
+    url: '/api/wms/work/order/page',
+    method: 'post',
+    data
+  })
+}
+
+export function ProcessInfoUpdata(data) { // 获取工单工艺列表
+  return request({
+    url: '/api/wms/work/order/update',
+    method: 'post',
+    data
+  })
+}
+
+export function ProcessInfoDetail(id) { // 获取工单工艺单条数据
+  const data = {
+    'id': id
+  }
+  return request({
+    url: '/api/wms/work/order/get',
+    method: 'post',
+    data
+  })
+}
+
+export function ExecutionInfoList(data) { // 获取工单执行列表
+  return request({
+    url: '/api/wms/work/order/execute/page',
+    method: 'post',
+    data
+  })
+}
+
+export function ExecutionInfoDetail(id) { // 获取工单执行单条数据
+  const data = {
+    'id': id
+  }
+  return request({
+    url: '/api/wms/work/order/execute/get',
+    method: 'post',
+    data
+  })
+}

src/api/orderManage/workOrder/workOrder.js

@@ -1,15 +1,23 @@
 /*
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-20 10:30:39
+ * @LastEditTime: 2022-03-04 09:35:14
  * @Description:
  */
 import request from '@/utils/request'
 
 export function workOrderList(data) { // 获取工单列表
   return request({
-    url: '/order/work-order/page',
+    url: '/api/order/work-order/page',
+    method: 'post',
+    data
+  })
+}
+
+export function workOrderListList(data) { // 00A获取工单列表
+  return request({
+    url: '/api/wms/work/order/page',
     method: 'post',
     data
   })
@@ -20,7 +28,7 @@ export function workOrderDetail(id) { // 获取工单单条数据
     'id': id
   }
   return request({
-    url: '/order/work-order/get',
+    url: '/api/order/work-order/get',
     method: 'post',
     data
   })
@@ -28,7 +36,7 @@ export function workOrderDetail(id) { // 获取工单单条数据
 
 export function workOrderUpdate(data) { // 更新工单单条数据
   return request({
-    url: '/order/work-order/update',
+    url: '/api/order/work-order/update',
     method: 'post',
     data
   })
@@ -36,7 +44,7 @@ export function workOrderUpdate(data) { // 更新工单单条数据
 
 export function workOrderAdd(data) { // 新增工单单条数据
   return request({
-    url: '/order/work-order/add',
+    url: '/api/order/work-order/add',
     method: 'post',
     data
   })
@@ -44,14 +52,14 @@ export function workOrderAdd(data) { // 新增工单单条数据
 
 export function workOrderCode() { // 获取工单code
   return request({
-    url: '/order/work-order/get-code',
+    url: '/api/order/work-order/get-code',
     method: 'post'
   })
 }
 
 export function workOrderDelete(id) { // 删除工单单条数据
   return request({
-    url: '/order/work-order/delete',
+    url: '/api/order/work-order/delete',
     method: 'post',
     data: { id }
   })
@@ -59,7 +67,7 @@ export function workOrderDelete(id) { // 删除工单单条数据
 
 export function workOrderIssueList(data) { // 获取工单下发列表
   return request({
-    url: '/order/wo-sync/page',
+    url: '/api/order/wo-sync/page',
     method: 'post',
     data
   })
@@ -67,7 +75,7 @@ export function workOrderIssueList(data) { // 获取工单下发列表
 
 export function packagingBoxList(data) { // 获取包装基板列表
   return request({
-    url: '/order/wo-packaging-box-substrate/page',
+    url: '/api/order/wo-packaging-box-substrate/page',
     method: 'post',
     data
   })
@@ -75,7 +83,7 @@ export function packagingBoxList(data) { // 获取包装基板列表
 
 export function packagingList(data) { // 获取包装标签列表
   return request({
-    url: '/order/wo-packaging-box/page',
+    url: '/api/order/wo-packaging-box/page',
     method: 'post',
     data
   })
@@ -86,7 +94,7 @@ export function packagingDetail(id) { // 获取包装标签详情
     'id': id
   }
   return request({
-    url: '/order/wo-packaging-box/get',
+    url: '/api/order/wo-packaging-box/get',
     method: 'post',
     data
   })
@@ -94,7 +102,7 @@ export function packagingDetail(id) { // 获取包装标签详情
 
 export function syncAdd(data) { // 新增下发工单单条数据
   return request({
-    url: '/order/wo-sync/add',
+    url: '/api/order/wo-sync/add',
     method: 'post',
     data
   })
@@ -102,7 +110,7 @@ export function syncAdd(data) { // 新增下发工单单条数据
 
 export function packagingInventoryList(data) { // 获取包装清单列表
   return request({
-    url: '/order/wo-packaging-box/page-for-inventory',
+    url: '/api/order/wo-packaging-box/page-for-inventory',
     method: 'post',
     data
   })
@@ -110,7 +118,7 @@ export function packagingInventoryList(data) { // 获取包装清单列表
 
 export function updateForStatus(data) { // 激活
   return request({
-    url: '/order/work-order/updateForStatus',
+    url: '/api/order/work-order/updateForStatus',
     method: 'post',
     data
   })

src/api/org.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-01-04 17:34:38
  * @LastEditors: zwq
- * @LastEditTime: 2021-04-12 14:23:30
+ * @LastEditTime: 2022-03-10 16:42:55
  * @FilePath: \basic-admin\src\api\org.js
  * @Description: 框架基础模块——组织结构
  */
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取组织结构列表
 export function getOrgList(data) {
   return request({
-    url: '/upms/org/page',
+    url: '/api/upms/org/page',
     method: 'post',
     data
   })
@@ -18,7 +18,7 @@ export function getOrgList(data) {
 
 export function getOrgDetail(id) { // 获取组织结构单条数据
   return request({
-    url: '/upms/org/get',
+    url: '/api/upms/org/get',
     method: 'post',
     data: { id }
   })
@@ -26,7 +26,7 @@ export function getOrgDetail(id) { // 获取组织结构单条数据
 
 // export function getOrgAllList(data) {
 //   return request({
-//     url: '/upms/org/list',
+//     url: '/api/upms/org/list',
 //     method: 'post',
 //     data
 //   })
@@ -35,7 +35,7 @@ export function getOrgDetail(id) { // 获取组织结构单条数据
 // 添加组织结构
 export function addOrg(data) {
   return request({
-    url: '/upms/org/add',
+    url: '/api/upms/org/add',
     method: 'post',
     data
   })
@@ -44,7 +44,7 @@ export function addOrg(data) {
 // 修改组织
 export function editOrg(data) {
   return request({
-    url: '/upms/org/update',
+    url: '/api/upms/org/update',
     method: 'post',
     data
   })
@@ -53,7 +53,7 @@ export function editOrg(data) {
 // 删除组织结构
 export function delOrg(id) {
   return request({
-    url: '/upms/org/delete',
+    url: '/api/upms/org/delete',
     method: 'post',
     data: { id }
   })

src/api/quality-manage/scrap.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-03-15 10:27:40
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-09 14:35:26
+ * @LastEditTime: 2022-03-03 15:40:29
  * @FilePath: \basic-admin\src\api\quality-manage\scrap.js
  * @Description:
  */
@@ -9,7 +9,7 @@ import request from '@/utils/request'
 
 export function getScrapList(data) {
   return request({
-    url: '/quality/scrap/page',
+    url: '/api/wms/scrap/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function getScrapList(data) {
 
 export function delScrapInfo(data) {
   return request({
-    url: '/quality/scrap/delete',
+    url: '/api/wms/scrap/delete',
     method: 'post',
     data
   })
@@ -25,7 +25,7 @@ export function delScrapInfo(data) {
 
 export function editScrapInfo(data) {
   return request({
-    url: '/quality/scrap/update',
+    url: '/api/wms/scrap/update',
     method: 'post',
     data
   })
@@ -33,14 +33,14 @@ export function editScrapInfo(data) {
 
 export function addScrapInfo(data) {
   return request({
-    url: '/quality/scrap/create',
+    url: '/api/wms/scrap/create',
     method: 'post',
     data
   })
 }
 export function getScrapInfo(data) {
   return request({
-    url: '/quality/scrap/findById',
+    url: '/api/wms/scrap/findById',
     method: 'post',
     data
   })
@@ -49,7 +49,7 @@ export function getScrapInfo(data) {
 // 废品报废 原因
 export function getscrapReason(data) {
   return request({
-    url: '/basic/scrap-information/get',
+    url: '/api/wms/scrap-information/get',
     method: 'post',
     data
   })
@@ -58,7 +58,7 @@ export function getscrapReason(data) {
 // 根据设备id查询肺片等级
 export function getScrap(id) {
   return request({
-    url: '/basic/equipment-scraps-grade/getScrapsGradeByEquipmentId',
+    url: '/api/wms/equipment-scraps-grade/getScrapsGradeByEquipmentId',
     method: 'post',
     data: { id }
   })

src/api/quality-manage/scrapCategoryStatistics.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-03-15 10:27:40
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-09 14:35:26
+ * @LastEditTime: 2022-03-03 15:40:35
  * @FilePath: \basic-admin\src\api\quality-manage\scrap.js
  * @Description:
  */
@@ -9,7 +9,7 @@ import request from '@/utils/request'
 
 export function getList(data) {
   return request({
-    url: '/quality/scrap/findReportByEquipmentId',
+    url: '/api/wms/scrap/findReportByEquipmentId',
     method: 'post',
     data
   })
@@ -18,7 +18,7 @@ export function getList(data) {
 // 废品报废 原因
 export function getscrapReason(data) {
   return request({
-    url: '/basic/scrap-information/get',
+    url: '/api/wms/scrap-information/get',
     method: 'post',
     data
   })

src/api/report-manage/formSort.js

@@ -1,15 +1,15 @@
 /*
  * @Author: gtz
  * @Date: 2021-04-01 09:24:20
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-04-16 13:24:51
+ * @LastEditTime: 2022-02-25 09:06:19
  * @Description: file content
  */
 import request from '@/utils/request'
 
 export function page(data) {
   return request({
-    url: '/report/report-sheet-category/page',
+    url: '/api/report/report-sheet-category/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function page(data) {
 
 export function list(data) {
   return request({
-    url: '/report/report-sheet-category/list',
+    url: '/api/report/report-sheet-category/list',
     method: 'post',
     data
   })
@@ -25,7 +25,7 @@ export function list(data) {
 
 export function del(data) {
   return request({
-    url: '/report/report-sheet-category/delete',
+    url: '/api/report/report-sheet-category/delete',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function del(data) {
 
 export function update(data) {
   return request({
-    url: '/report/report-sheet-category/update',
+    url: '/api/report/report-sheet-category/update',
     method: 'post',
     data
   })
@@ -41,7 +41,7 @@ export function update(data) {
 
 export function add(data) {
   return request({
-    url: '/report/report-sheet-category/add',
+    url: '/api/report/report-sheet-category/add',
     method: 'post',
     data
   })
@@ -49,7 +49,7 @@ export function add(data) {
 
 export function getData(data) {
   return request({
-    url: '/report/report-sheet-category/get',
+    url: '/api/report/report-sheet-category/get',
     method: 'post',
     data
   })

src/api/report-manage/report.js

@@ -1,23 +1,41 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-07 18:39:03
- * @LastEditors: gtz
+ * @LastEditors: fzq
- * @LastEditTime: 2021-04-22 20:03:49
+ * @LastEditTime: 2022-03-08 15:31:13
  * @Description: file content
  */
 import request from '@/utils/request'
-
+// 获取当前库存存储箱列表
-export function page(data) {
+export function list(data) {
   return request({
-    url: '/report/report-sheet/page',
+    url: '/api/report/report-storage-box/list',
     method: 'post',
     data
   })
 }
+// 获取当前库存存储箱分页报表
+export function page(data) {
+  return request({
+    url: '/api/report/report-storage-box/page',
+    method: 'post',
+    data
+  })
+}
+// 导出当前库存存储箱列表
+export function download(data) {
+  return request({
+    url: '/api/report/report-storage-box/excel-download',
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 60000
+  })
+}
 
 export function del(data) {
   return request({
-    url: '/report/report-sheet/delete',
+    url: '/api/report/report-sheet/delete',
     method: 'post',
     data
   })
@@ -25,7 +43,7 @@ export function del(data) {
 
 export function getInfo(data) {
   return request({
-    url: '/report/report-sheet/get',
+    url: '/api/report/report-sheet/get',
     method: 'post',
     data
   })
@@ -33,7 +51,7 @@ export function getInfo(data) {
 
 export function update(data) {
   return request({
-    url: '/report/report-sheet/update',
+    url: '/api/report/report-sheet/update',
     method: 'post',
     data
   })
@@ -42,7 +60,48 @@ export function update(data) {
 // 报表分类列表
 export function listCategory(data) {
   return request({
-    url: '/report/report-sheet-category/list',
+    url: '/api/report/report-sheet-category/list',
+    method: 'post',
+    data
+  })
+}
+
+// 获取当前存储箱对应基板列表
+export function listSubstrate(data) {
+  return request({
+    url: '/api/report/report-substrate/list',
+    method: 'post',
+    data
+  })
+}
+// 删除基板信息
+export function deleSubstrate(data) {
+  return request({
+    url: '/api/report/report-substrate/delete',
+    method: 'post',
+    data
+  })
+}
+// 获取当前存储箱对应基板分页报表
+export function pageSubstrate(data) {
+  return request({
+    url: '/api/report/report-substrate/page',
+    method: 'post',
+    data
+  })
+}
+// 更新基板信息
+export function updateSubstrate(data) {
+  return request({
+    url: '/api/report/report-substrate/update',
+    method: 'post',
+    data
+  })
+}
+// 导出当前存储箱对应基板列表
+export function downloadSubstrate(data) {
+  return request({
+    url: '/api/report/report-substrate/excel-download',
     method: 'post',
     data
   })

src/api/role.js

@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取角色详细信息
 export function getRoleInfo(data) {
   return request({
-    url: `/upms/role/get`,
+    url: `/api/upms/role/get`,
     method: 'post',
     data
   })
@@ -18,7 +18,7 @@ export function getRoleInfo(data) {
 
 export function RoleCode() { // 获取code
   return request({
-    url: '/upms/role/get-code',
+    url: '/api/upms/role/get-code',
     method: 'post'
   })
 }
@@ -26,7 +26,7 @@ export function RoleCode() { // 获取code
 // 获取角色列表
 export function getRoleList(data) {
   return request({
-    url: '/upms/role/list',
+    url: '/api/upms/role/list',
     method: 'post',
     data
   })
@@ -35,7 +35,7 @@ export function getRoleList(data) {
 // 添加角色
 export function addRole(data) {
   return request({
-    url: '/upms/role/add',
+    url: '/api/upms/role/add',
     method: 'post',
     data
   })
@@ -44,7 +44,7 @@ export function addRole(data) {
 // 修改角色
 export function updateRole(data) {
   return request({
-    url: '/upms/role/update',
+    url: '/api/upms/role/update',
     method: 'post',
     data
   })
@@ -53,7 +53,7 @@ export function updateRole(data) {
 // 删除角色
 export function deleteRole(data) {
   return request({
-    url: `/upms/role/delete`,
+    url: `/api/upms/role/delete`,
     method: 'post',
     data
   })
@@ -62,7 +62,7 @@ export function deleteRole(data) {
 // 启停角色
 export function enableRole(data) {
   return request({
-    url: `/upms/role/enabled`,
+    url: `/api/upms/role/enabled`,
     method: 'post',
     data
   })
@@ -71,7 +71,7 @@ export function enableRole(data) {
 // 用户-角色关联授权
 export function saveUserRole(data) {
   return request({
-    url: '/upms/role/saveUserRole',
+    url: '/api/upms/role/saveUserRole',
     method: 'post',
     data
   })
@@ -80,7 +80,7 @@ export function saveUserRole(data) {
 // 用户-角色关联获取
 export function listByUser(id) {
   return request({
-    url: '/upms/role/listByUser',
+    url: '/api/upms/role/listByUser',
     method: 'post',
     data: { id }
   })

src/api/user.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: guo
+ * @LastEditors: zwq
- * @LastEditTime: 2021-01-11 09:40:09
+ * @LastEditTime: 2022-03-10 16:41:55
  * @FilePath: \basic-admin\src\api\user.js
  * @Description: 用户管理 & 登录用户的相关api接口定义
  */
@@ -13,7 +13,8 @@ export function login(data) {
     userType: 1
   })
   return request({
-    url: '/passport/login',
+    url: '/api/passport/login',
+    // url: '/passport/login',
     method: 'post',
     data: dto
   })
@@ -28,7 +29,7 @@ export function logout() {
 // 获取当前登录的用户信息
 export function getUserInfo(data) {
   return request({
-    url: '/passport/getLoginUser',
+    url: '/api/passport/getLoginUser',
     method: 'post',
     data
   })
@@ -37,7 +38,7 @@ export function getUserInfo(data) {
 // 修改当前用户密码
 export function editUserPW(data) {
   return request({
-    url: '/upms/user/modifyPassword',
+    url: '/api/upms/user/modifyPassword',
     method: 'post',
     data
   })
@@ -46,17 +47,17 @@ export function editUserPW(data) {
 // 当前用户 找回密码
 export function findUserPW(data) {
   return request({
-    url: '/upms/user/findPassword',
+    url: '/api/upms/user/findPassword',
     method: 'post',
     data
   })
 }
 
 // 下面为：用户管理列表
-// 获取用户列表 （根据需求可以考虑换成带分页的 /upms/user/page）
+// 获取用户列表 （根据需求可以考虑换成带分页的 /api/upms/user/page）
 export function getUserList(data) {
   return request({
-    url: '/upms/user/page',
+    url: '/api/upms/user/page',
     method: 'post',
     data
   })
@@ -65,7 +66,7 @@ export function getUserList(data) {
 // 新增用户
 export function addUser(data) {
   return request({
-    url: '/upms/user/add',
+    url: '/api/upms/user/add',
     method: 'post',
     data
   })
@@ -74,7 +75,7 @@ export function addUser(data) {
 // 删除用户
 export function delUser(data) {
   return request({
-    url: '/upms/user/delete',
+    url: '/api/upms/user/delete',
     method: 'post',
     data
   })
@@ -83,7 +84,7 @@ export function delUser(data) {
 // 修改用户信息
 export function editUser(data) {
   return request({
-    url: '/upms/user/update',
+    url: '/api/upms/user/update',
     method: 'post',
     data
   })
@@ -92,7 +93,7 @@ export function editUser(data) {
 // 获取用户详细信息
 export function getUserDetail(data) {
   return request({
-    url: '/upms/user/get',
+    url: '/api/upms/user/get',
     method: 'post',
     data
   })
@@ -101,7 +102,7 @@ export function getUserDetail(data) {
 // 管理员重置用户的密码
 export function resetUserPW(data) {
   return request({
-    url: '/upms/user/resetPassword',
+    url: '/api/upms/user/resetPassword',
     method: 'post',
     data
   })
@@ -110,7 +111,7 @@ export function resetUserPW(data) {
 // 启停用户信息
 export function enableUser(data) {
   return request({
-    url: '/upms/user/enabled',
+    url: '/api/upms/user/enabled',
     method: 'post',
     data
   })

src/filters/basicData/index.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-29 16:49:28
  * @LastEditors: zwq
- * @LastEditTime: 2021-07-21 15:56:54
+ * @LastEditTime: 2022-01-17 15:31:40
  * @FilePath: \basic-admin\src\filters\basicData\index.js
  * @Description:
  */
@@ -63,9 +63,9 @@ const table = {
     '1': i18n.t('basicDataFilter.enableState.enable')
   },
   storage: {
-    '0': i18n.t('basicDataFilter.enableState.normal'),
+    '0': i18n.t('basicDataFilter.storage.normal'),
-    '1': i18n.t('basicDataFilter.enableState.repairing'),
+    '1': i18n.t('basicDataFilter.storage.repairing'),
-    '2': i18n.t('basicDataFilter.enableState.scrap')
+    '2': i18n.t('basicDataFilter.storage.scrap')
   }
 }
 

src/filters/basicData/warehouse.js

@@ -0,0 +1,33 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-01-17 11:30:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-01-17 11:33:29
+ * @Description:
+ */
+/*
+ * @Date: 2020-12-29 16:49:28
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-04-13 13:49:51
+ * @FilePath: \basic-admin\src\filters\DataDict\index.js
+ * @Description: 部分常量的数据字典定义
+ */
+
+import i18n from '@/lang'
+
+const table = {
+  yesOrNo: {
+    '0': i18n.t('baseDict.yesOrNo.no'),
+    '1': i18n.t('baseDict.yesOrNo.yes')
+  },
+  enableState: {
+    '0': i18n.t('basicDataFilter.enableState.disable'),
+    '1': i18n.t('basicDataFilter.enableState.enable')
+  }
+}
+
+export default function(dictTable) {
+  return function(val) {
+    return table?.[dictTable]?.[val]
+  }
+}

src/filters/index.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: Please set LastEditors
+ * @LastEditors: fzq
- * @LastEditTime: 2021-07-22 09:12:23
+ * @LastEditTime: 2022-03-05 11:13:00
  * @FilePath: \basic-admin\src\filters\index.js
  * @Description: 过滤器定义、多语言过滤器修改
  */

src/lang/i18n.js

@@ -1,7 +1,7 @@
 export default {
   title: {
-    en: 'ARI MES',
+    en: 'ARI WMS',
-    zh: '中建材自动化智能制造执行系统'
+    zh: '中建材自动化智能仓库管理系统'
   },
   btn: {
     start: {
@@ -68,6 +68,10 @@ export default {
       zh: '返回',
       en: 'Back'
     },
+    export: {
+      zh: '导出',
+      en: 'Export'
+    },
     checkLog: {
       zh: '查看日志',
       en: 'Check Log'
@@ -111,6 +115,10 @@ export default {
     design: {
       zh: '设计',
       en: 'Design'
+    },
+    refresh: {
+      zh: '刷新',
+      en: 'Refresh'
     }
   },
   navbar: {
@@ -254,12 +262,8 @@ export default {
   },
   routerTitle: {
     dashboard: {
-      zh: '',
+      zh: '首页',
-      en: '',
+      en: 'Home'
-      dashboard: {
-        zh: '仪表盘',
-        en: 'Dashboard'
-      }
     },
     basic: {
       zh: '系统管理',
@@ -284,6 +288,10 @@ export default {
     equipment: {
       zh: '设备管理',
       en: 'Equipment Manager',
+      EquipmentUtilizationRate: {
+        zh: '设备稼动率',
+        en: 'EQ OEE'
+      },
       EquipmentVisualization: {
         zh: '设备可视化',
         en: 'Equipment Visualization',
@@ -552,8 +560,8 @@ export default {
         zh: '缓存区信息',
         en: 'Ports Info',
         ports: {
-          zh: '仓库',
+          zh: '缓存区信息',
-          en: 'Warehouse'
+          en: 'Ports Info'
         },
         area: {
           zh: '区域',
@@ -571,10 +579,18 @@ export default {
           zh: '货架信息',
           en: 'Shelf Add'
         },
+        shelfInfo: {
+          zh: '货位管理',
+          en: 'Shelf Info'
+        },
         locationAdd: {
           zh: '库位信息',
           en: 'Location Add'
         },
+        location: {
+          zh: '添加库位',
+          en: 'Location Management'
+        },
         storageBox: {
           zh: '存储箱',
           en: 'Storage Box'
@@ -584,6 +600,18 @@ export default {
           en: 'Position Detail Info'
         }
       },
+      process: {
+        zh: '工序信息',
+        en: 'ProcessLocation Info',
+        processInfo: {
+          zh: '工序库位信息',
+          en: 'ProcessLocation Info'
+        },
+        processInfoAdd: {
+          zh: '工序库位信息管理',
+          en: 'ProcessLocation Manage'
+        }
+      },
       equipment: {
         zh: '设备信息',
         en: 'Equipment Info',
@@ -709,6 +737,30 @@ export default {
         }
       }
     },
+    Warehouse: {
+      zh: '仓库管理',
+      en: 'Warehouse Manager',
+      StorageBoxInfo: {
+        zh: '存储箱信息',
+        en: 'Storage Box Info'
+      },
+      StorageBoxRack: {
+        zh: '存储箱上架',
+        en: 'Storage Box Rack'
+      },
+      CurrentTask: {
+        zh: '当前任务',
+        en: 'Current Task'
+      },
+      HistoricalTask: {
+        zh: '历史任务',
+        en: 'Historical Task'
+      },
+      ProcessStorageManagement: {
+        zh: '工序存储区域管理',
+        en: 'Process Storage Management'
+      }
+    },
     order: {
       zh: '工单管理',
       en: 'Order Manager',
@@ -716,6 +768,14 @@ export default {
         zh: 'Power Classification',
         en: 'Power Classification'
       },
+      ProcessInfo: {
+        zh: '工单工艺信息',
+        en: 'Order Process Info'
+      },
+      ExecutionInfo: {
+        zh: '执行信息',
+        en: 'Execution Info'
+      },
       consumption: {
         zh: '工单能耗',
         en: 'Energy consumption of the repair order'
@@ -892,6 +952,26 @@ export default {
     form: {
       zh: '报表管理',
       en: 'Report Form',
+      currentInventory: {
+        zh: '当前库存',
+        en: 'Current Inventory'
+      },
+      currentEmptyBox: {
+        zh: '当前仓库空箱信息',
+        en: 'Current Empty Box'
+      },
+      currentSubstrate: {
+        zh: '当前基板流转情况',
+        en: 'Current Substrate'
+      },
+      viewSubstrate: {
+        zh: '查看基板',
+        en: 'View Substrate'
+      },
+      editSubstrate: {
+        zh: '编辑基板',
+        en: 'Edit Substrate'
+      },
       report: {
         zh: '报表列表',
         en: 'Report List'
@@ -928,6 +1008,18 @@ export default {
         zh: '质量检测计划',
         en: 'Quality Detect Plan'
       },
+      scrapManagement: {
+        zh: '废片管理',
+        en: 'Scrap management',
+        gradeInfo: {
+          zh: '等级信息',
+          en: 'Grade Info'
+        },
+        scrapInfo: {
+          zh: '废片信息',
+          en: 'Scrap Info'
+        }
+      },
       knowledge: {
         zh: '维护保养知识库',
         en: 'Maintain the knowledge base'

src/lang/i18n/en/btn/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:19:14
- * @LastEditors: Please set LastEditors
+ * @LastEditors: fzq
- * @LastEditTime: 2021-07-13 20:32:02
+ * @LastEditTime: 2022-03-08 15:48:54
  * @Description: file content
  */
 
@@ -90,5 +90,9 @@ export default {
   download: {
     zh: '下载',
     en: 'download'
+  },
+  export: {
+    zh: '导出',
+    en: 'export'
   }
 }

src/lang/i18n/en/module/art.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:45:54
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-04-15 19:34:46
+ * @LastEditTime: 2022-03-04 15:07:12
  * @Description: file content
  */
 
@@ -47,6 +47,7 @@ export default {
   sameEqError: 'Can not choice same equipment!',
   processList: {
     processName: 'Process Step Name',
+    processCode: 'process Code',
     processEq: 'Process Step Equipment',
     description: 'Description',
     addProcess: 'Add a Process Step',

src/lang/i18n/en/module/basicData.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2021-07-21 09:59:34
+ * @LastEditTime: 2022-03-18 14:03:12
  * @Description: file content
  */
 export default {
@@ -30,6 +30,7 @@ export default {
     cancelButtonText: 'cancel',
     Tips: 'Tips',
     TipsBefore: 'Are you sure you want to delete',
+    TipsStorageBefore: 'Confirm to add location:',
     Description: 'Description',
     Remarks: 'Remarks',
     Yes: 'Yes',
@@ -53,7 +54,8 @@ export default {
     editLocation: 'Edit Location Point',
     location: 'Location',
     locationTip: 'Click the picture below to select a point. After selecting a point, select a location in the pop-up box. If you do not select a location when adding a new point, you cannot select the next point. If you want to adjust the order of the points, drag the label at the bottom of the picture to the position you want to adjust. Click to confirm the submission point information and click Reset to reset the point information to the state when the pop-up box is opened',
-    locationInfo: 'Location Point Info'
+    locationInfo: 'Location Point Info',
+    storageCode: 'storageBoxCode'
   },
   factory: {
     placeholderName: 'Name Or Code',
@@ -126,13 +128,29 @@ export default {
     AlarmTypeCode: 'Alarm Type Code',
     LevelCode: 'Level Code'
   },
+  processLocation: {
+    sequence: 'Sequence',
+    locationName: 'Location Name',
+    isProcess: 'Location Type',
+    locationId: 'Location Id',
+    workSequenId: 'Work Sequence Id',
+    equipmentMark: 'Equipment Mark',
+    portAttrId: 'Port Attribute Id',
+    goodsShelves: 'Goods Shelves',
+    ProcessLocation: 'Process Location',
+    CacheLocation: 'Cache Location',
+    aShelf: 'Shelf A',
+    bShelf: 'Shelf B'
+  },
   cache: {
     CacheCode: 'Ports Code',
     CacheName: 'Ports Name',
     StockNumber: 'Stock Number',
-    AreaNumber: 'Area Number',
+    AreaNumber: 'Shelf Number',
-    AreaCode: 'Area Code',
+    AreaCode: 'Shelf Code',
-    AreaName: 'Area Name',
+    AreaName: 'Shelf Name',
+    rowNum: 'Row Num',
+    columnNum: 'Column Num',
     Shelf: 'Shelf',
     ManageShelves: 'Manage Shelves',
     ShelfCode: 'Shelf Code',
@@ -145,7 +163,19 @@ export default {
     LocationName: 'Location Name',
     anotherName: 'Another Name',
     place: 'Place',
-    addCacheArea: 'add Ports Area'
+    addCacheArea: 'add Ports Shelf',
+    warning: 'Layers and Columns must be integer!',
+    logisticsEquipment: 'Logistics Equipment',
+    processEquipment: 'Process Equipment',
+    sheCode: 'Shelf Code',
+    sheName: 'Shelf Name',
+    locaNum: 'Location Number',
+    addLocation: 'Add Location',
+    columnMark: 'Column Mark',
+    rowMark: 'Row Mark',
+    status: 'Status',
+    man: 'Man',
+    woman: 'Woman'
   },
   storageBox: {
     name: 'Name',
@@ -157,7 +187,10 @@ export default {
     remark: 'Remark',
     PositionNo: 'PositionNo',
     PositionCode: 'PositionCode',
-    PositionCodeAlias: 'PositionCodeAlias'
+    PositionCodeAlias: 'PositionCodeAlias',
+    scrapped: 'Scrapped',
+    normal: 'Normal',
+    repairing: 'Repairing'
   },
   equipment: {
     EquipmentName: 'Equipment Name',
@@ -223,6 +256,7 @@ export default {
     wasteGrade: 'Waste Grade',
     RegisterPerson: 'Register Person',
     updateTime: 'Update Time',
+    registrationPlace: 'Registration Place',
     cause: 'Cause',
     causeCode: 'Cause Code',
     WasteName: 'Waste Name',
@@ -234,7 +268,7 @@ export default {
     entryType: 'Manual/Automatic',
     automatic: 'automatic',
     manual: 'Manual',
-    workOrderId: 'workOrderId'
+    workOrderName: 'Work Order Name'
   },
   productPool: {
     productName: 'Product Name',
@@ -272,5 +306,60 @@ export default {
   EquipmentScrapGrade: {
     keyword: 'name',
     ScrapGrade: 'Scrap Grade'
+  },
+  Warehouse: {
+    Code: 'Code',
+    TaskType: 'Task Type',
+    TaskStatus: 'Task Status',
+    TaskSource: 'Task Source',
+    VehicleName: 'Vehicle Name',
+    TimeSlot: 'Time Slot',
+    ExecutionTime: 'Execution Time',
+    BoxStatus: 'Box Status',
+    BoxNumber: 'Box Number',
+    PreviousOperation: 'Previous Operation',
+    ExecutionOperation: 'Execution Operation',
+    NextOperation: 'Next Operation',
+    CompletionTime: 'Completion Time',
+    StartLocation: 'Start Location',
+    FullBoxStartLocation: 'FullBox Start Location',
+    TaskLocation: 'Task Location',
+    TargetLocation: 'Target Location',
+    OrderName: 'Order Name',
+    OrderType: 'Order Type',
+    OrderCode: 'Order Code',
+    IssueOrderTime: 'Issue Order Time',
+    startProduceTime: 'Start Produce Time',
+    TotalProcessName: 'Total Process Name',
+    Priority: 'Priority',
+    OrderStatus: 'Order Status',
+    triggerOrigin: 'Trigger Origin',
+    ProcessOrNot: 'Process Or Not',
+    Unit: 'Unit',
+    scrapQuantity: 'Scrap Quantity',
+    RelateProcess: 'Relate Process',
+    PlanProcessQuantity: 'Plan Process Quantity',
+    actualProcessQuantity: 'Actual Process Quantity',
+    SubProcessName: 'Sub Process Name',
+    TaskBoxNumber: 'Task Box Number',
+    FullBoxNumber: 'Full Box Number',
+    EmptyFork: 'Empty Fork',
+    TaskBoxFork: 'Task Box Fork',
+    EmptyHandlingTime: 'Empty Handling Time',
+    TaskBoxHandlingTime: 'TaskBox Handling Time',
+    StorageBoxNumber: 'Storage Box Number',
+    CurrentLocation: 'Current Location',
+    IsEmpty: 'Is Empty',
+    IsEmptyBox: 'Is Empty Box',
+    LocationName: 'Location Name',
+    LocationCode: 'Location Code',
+    PerformTaskManual: 'Perform Task Manual',
+    processStorageLink: 'Process Storage Link',
+    SelectStorageType: 'Select Storage Type',
+    LocationStorageSetting: 'Location Storage Setting',
+    publishTask: 'Publish The Task',
+    startPosition: 'Start',
+    endPosition: 'End',
+    taskType: 'Task Type'
   }
 }

src/lang/i18n/en/module/dashboard.js

@@ -0,0 +1,23 @@
+/*
+ * @Author: gtz
+ * @Date: 2022-03-15 16:42:34
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-16 20:01:32
+ * @Description: file content
+ * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
+ */
+
+export default {
+  first: 'First Row',
+  second: 'Second Row',
+  title: 'WMS Inventory Information',
+  pageHeader: 'No.',
+  pageFooter: ' Page',
+  isEmpty: 'Is Empty',
+  status: 'Status',
+  storageBoxCode: 'Cassette Code',
+  name: 'Location Name',
+  attribute: 'Location Attribute',
+  cassetteStatus: 'Cassette Status',
+  workOrderNo: 'Work Order Number'
+}

src/lang/i18n/en/module/equipmentManager.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-03-05 10:04:30
- * @LastEditors: Please set LastEditors
+ * @LastEditors: DY
- * @LastEditTime: 2021-07-23 09:13:56
+ * @LastEditTime: 2022-03-03 16:31:23
  * @FilePath: \basic-admin\src\lang\i18n\en\module\equipmentManager.js
  * @Description:
  */
@@ -19,6 +19,68 @@ export default {
     Water: 'Water',
     Gas: 'Gas'
   },
+  monitoringInfo: {
+    allCycles: 'Total cycle Times',
+    badTimes: 'Failure Times',
+    time: 'Time',
+    MCBF: 'MCBF',
+    previousStatus: 'State Before',
+    runTime: 'UpTime (hours)',
+    produceTime: 'Production time (hours)',
+    productiveCount: 'Actual Capacity',
+    timeRate: 'Time Start Rate',
+    performanceRate: 'Performance Start Rate',
+    oee: 'OEE',
+    E10StartTime: 'E10 StartTime',
+    E10endTime: 'E10 EndTime',
+    laterE10Status: 'Changed E10 State',
+    duration: 'Duration',
+    goodsNumbers: 'OK Quantity',
+    noOkNumbers: 'NOK Quantity',
+    onceOkCount: 'OK Quantity Of Fist Process ',
+    reworkOkCount: 'OK Quantity Of Rework ',
+    GetTimePeriod: 'Time Period',
+    ProductionTimePeriod: 'Production Time Period',
+    MaintenanceTimes: 'Maintenance Times',
+    RunningTime: 'Running Time',
+    E10status: 'E10 State',
+    number: 'Quantity Produced Of Current day',
+    yieId: 'Daily yield',
+    bom: 'Daily Consumption Of Materials,',
+    controlState: 'Control State',
+    equipmentName: 'EQ Name',
+    e10Code: 'E10 State',
+    materialName: 'MaterialName',
+    port: 'Loading Port',
+    productCount: 'Product Quantity',
+    spec: 'Spec',
+    materialNo: 'MaterialNo',
+    upTime: 'Loading Time',
+    upCount: 'Loading Amount',
+    useCount: 'Used Amount',
+    unit: 'Unit',
+    eventName: 'EventName',
+    paramName: 'ParamName',
+    paramValue: 'ParamValue',
+    standardFormat: 'StandardFormat',
+    paramFormat: 'ParamFormat',
+    receiveTime: 'ReceivedTime',
+    recipe: 'EQ Recipe',
+    controlStatus: 'Control State',
+    traceDataState: 'Trace Data OpenState',
+    controlStateUpdateTime: 'Control State UpdateTime',
+    e10UpdateTime: 'E10 Update Time',
+    StateFlg: 'StateFlag',
+    EnableSpooling: 'EnableSpooling',
+    maxspooltransmit: 'MaxSpoolTransmit',
+    spoolingstate: 'SpoolingState',
+    spoolingcountactual: 'SpoolingCountActual',
+    SpoolingCountTotal: 'SpoolingCountTotal',
+    F1F3Succ: 'F1F3 Request Success',
+    F2F13Succ: 'F2F13 Request Success',
+    baseChart: 'Processed Substrates Quantity',
+    monitorChart: 'EQ Running Time'
+  },
   sparepart: {
     'sparepart': 'Sparepart',
     'code': 'Sparepart number',

src/lang/i18n/en/module/index.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:12:46
  * @LastEditors: gtz
- * @LastEditTime: 2021-04-22 19:49:39
+ * @LastEditTime: 2022-03-15 16:44:11
  * @Description: file content
  */
 
@@ -17,6 +17,7 @@ import quality from './quality'
 import factory from './factory'
 import formManage from './formManage'
 import report from './report'
+import dashboard from './dashboard'
 
 export default {
   basicData,
@@ -29,5 +30,6 @@ export default {
   quality,
   factory,
   formManage,
-  report
+  report,
+  dashboard
 }

src/lang/i18n/en/module/quality.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-03-13 13:49:16
  * @LastEditors: zwq
- * @LastEditTime: 2021-04-15 09:59:15
+ * @LastEditTime: 2022-03-04 09:21:36
  * @FilePath: \basic-admin\src\lang\i18n\en\module\quality.js
  * @Description:
  */
@@ -90,5 +90,10 @@ export default {
     subTitle: 'Scrap Category Statistics',
     completeWaste: 'Complete Waste',
     CanBeUsedAfterProcessing: 'Can be used after processing'
+  },
+  QCPplan: {
+    QCPcode: 'QCP Code',
+    getTime: 'Get Time',
+    detail: 'Detail'
   }
 }

src/lang/i18n/en/module/report.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-04-22 19:48:46
- * @LastEditors: gtz
+ * @LastEditors: fzq
- * @LastEditTime: 2021-04-23 14:36:08
+ * @LastEditTime: 2022-03-18 14:50:00
  * @Description: file content
  */
 
@@ -11,7 +11,35 @@ export default {
     reportName: 'Report name',
     reportSort: 'Report Sort',
     createTime: 'Create Date',
-    operation: 'Operation'
+    operation: 'Operation',
+    storageBoxNumber: 'StorageBox Number',
+    queryFiltering: 'Query Filtering',
+    storageBoxReport: 'StorageBoxReport'
+  },
+  inventory: {
+    code: 'Code',
+    status: 'Status',
+    inprocessCode: 'Inprocess Code',
+    nextprocessCode: 'Next Process Code',
+    currentLocation: 'Current Location',
+    storeTime: 'Store Time',
+    orderName: 'Order Name',
+    substrateDetails: 'Substrate Details',
+    viewSubstrates: 'View Substrates',
+    manual: 'Manual',
+    downl: 'Download'
+  },
+  substrate: {
+    substrateCode: 'SubstrateCode',
+    location: 'Location',
+    storeTime: 'Store Time',
+    substrateStatus: 'Substrate Status',
+    editSubstrate: 'Edit Substrate',
+    interCode: 'Inter Code',
+    subStorageStatus: 'Sub Storage Status',
+    load: 'Load',
+    unload: 'Unload',
+    machineHandID: 'Machine Hand ID'
   },
   reportSort: {
     all: 'All'

src/lang/i18n/zh/module/art.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:46:00
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-04-15 19:35:00
+ * @LastEditTime: 2022-03-04 15:07:02
  * @Description: file content
  */
 
@@ -47,6 +47,7 @@ export default {
   sameEqError: '不能选择相同的设备!',
   processList: {
     processName: '工序名称',
+    processCode: '工序编码',
     processEq: '工序设备',
     description: '描述',
     addProcess: '添加一道工序',

src/lang/i18n/zh/module/basicData.js

@@ -1,9 +1,9 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2021-07-21 09:58:59
+ * @LastEditTime: 2022-03-18 14:56:18
- * @Description: file content
+ * * @Description: file content
  */
 export default {
   visual: {
@@ -30,6 +30,8 @@ export default {
     cancelButtonText: '取消',
     Tips: '提示',
     TipsBefore: '确定删除',
+    TipsStorageBefore: '确定添加库位:',
+    PleaseAddLocationFirst: '请先添加库位!',
     Description: '描述',
     Remarks: '备注',
     Or: '或',
@@ -53,7 +55,8 @@ export default {
     editLocation: '编辑库位点',
     location: '库位',
     locationTip: '点击下方图片选点，选点后在弹出框内选择库位，新增点位时未选择库位无法进行下一个选点，若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息，点击重置将点位信息重置到打开弹出框时的状态',
-    locationInfo: '库位点信息'
+    locationInfo: '库位点信息',
+    storageCode: '存储箱号'
   },
   factory: {
     placeholderName: '名称或编码',
@@ -130,26 +133,41 @@ export default {
     CacheCode: '缓存区编码',
     CacheName: '缓存区名称',
     StockNumber: '库位数量',
-    AreaNumber: '区域数量',
+    AreaNumber: '货架数量',
-    AreaCode: '区域编码',
+    AreaCode: '货架编码',
-    AreaName: '区域名称',
+    AreaName: '货架名称',
+    rowNum: '行数',
+    columnNum: '列数',
+    rowMark: '行标',
+    columnMark: '列标',
     Shelf: '货架',
     ManageShelves: '管理货架',
     ShelfCode: '货架编码',
     ShelfName: '货架名称',
     ShelfNumber: '货架数量',
     StorageQuantity: '存储数量',
-    Location: '货位',
+    Location: '库位',
     ManageLocation: '管理货位',
     LocationCode: '库位编码',
     LocationName: '库位名称',
-    anotherName: '别名',
+    locationType: '库位类型',
+    anotherName: '库位别名',
     place: '位置',
-    addCacheArea: '添加区域'
+    addCacheArea: '添加货架',
+    addLocation: '添加库位',
+    status: '状态',
+    warning: '行列标必须为整数！',
+    logisticsEquipment: '物流设备',
+    processEquipment: '工艺设备',
+    sheCode: '货架编码',
+    sheName: '货架名',
+    locaNum: '库存数量',
+    man: '男',
+    woman: '女'
   },
   storageBox: {
-    name: '名称',
+    name: '存储箱名称',
-    code: '编码',
+    code: '存储箱编码',
     alias: '别名',
     StorageQuantity: '存储数量',
     status: '状态',
@@ -157,9 +175,15 @@ export default {
     remark: '备注',
     PositionNo: '位置序号',
     PositionCode: '位置编码',
-    PositionCodeAlias: '位置编码别名'
+    PositionCodeAlias: '位置编码别名',
+    scrapped: '报废',
+    normal: '正常',
+    repairing: '维修中'
+
   },
   equipment: {
+    shortName: '名称缩写',
+    enName: '英文名称',
     EquipmentName: '设备名称',
     EquipmentCode: '设备编码',
     EquipmentType: '设备类型',
@@ -223,6 +247,7 @@ export default {
     wasteGrade: '废品等级',
     RegisterPerson: '登记人',
     updateTime: '登记时间',
+    registrationPlace: '登记地点',
     cause: '报废原因',
     causeCode: '报废原因编码',
     WasteName: '废品报废名称',
@@ -234,7 +259,21 @@ export default {
     entryType: '手动/自动',
     automatic: '自动',
     manual: '手动',
-    workOrderId: '工单名称'
+    workOrderName: '工单名称'
+  },
+  processLocation: {
+    sequence: '顺序',
+    locationName: '库位名',
+    isProcess: '库位类型',
+    locationId: '库位ID',
+    workSequenId: '工序ID',
+    equipmentMark: '设备标记',
+    portAttrId: '库位属性ID',
+    goodsShelves: '货架',
+    CacheLocation: '缓存区库位',
+    ProcessLocation: '工序库位',
+    aShelf: 'a货架',
+    bShelf: 'b货架'
   },
   productPool: {
     productName: '产品名称',
@@ -272,5 +311,60 @@ export default {
   EquipmentScrapGrade: {
     keyword: '名称',
     ScrapGrade: '废片等级'
+  },
+  Warehouse: {
+    Code: '编码',
+    TaskType: '任务类型',
+    TaskStatus: '任务状态',
+    TaskSource: '任务来源',
+    VehicleName: '车辆名',
+    TimeSlot: '时间段',
+    ExecutionTime: '执行时间',
+    BoxStatus: '箱状态',
+    BoxNumber: '箱号',
+    PreviousOperation: '上一个工序',
+    ExecutionOperation: '执行工序',
+    NextOperation: '下一个工序',
+    CompletionTime: '完成时间',
+    StartLocation: '开始库位',
+    FullBoxStartLocation: '空箱开始库位',
+    TaskLocation: '任务库位',
+    TargetLocation: '目标库位',
+    OrderName: '工单名',
+    OrderType: '工单类型',
+    OrderCode: '工单编码',
+    IssueOrderTime: '下发工单时间',
+    startProduceTime: '开始生产时间',
+    TotalProcessName: '总工艺名称',
+    Priority: '优先级',
+    scrapQuantity: '废片数量',
+    OrderStatus: '工单状态',
+    triggerOrigin: '工单发起方',
+    ProcessOrNot: '是否关联工艺',
+    Unit: '单位',
+    RelateProcess: '关联工艺',
+    PlanProcessQuantity: '计划加工数量',
+    actualProcessQuantity: '实际加工数量',
+    SubProcessName: '分工艺',
+    TaskBoxNumber: '任务箱号',
+    FullBoxNumber: '空箱号',
+    EmptyFork: '空箱货叉',
+    TaskBoxFork: '任务箱货叉',
+    EmptyHandlingTime: '搬运空箱时间',
+    TaskBoxHandlingTime: '搬运任务箱时间',
+    StorageBoxNumber: '存储箱号',
+    CurrentLocation: '当前库位',
+    IsEmpty: '是否有基板',
+    IsEmptyBox: '是否空箱',
+    LocationName: '库位名',
+    LocationCode: '库位编码',
+    PerformTaskManual: '手动执行任务',
+    processStorageLink: '工序关联库位',
+    SelectStorageType: '选择库位类型',
+    LocationStorageSetting: '库位存储箱设置',
+    publishTask: '发布任务',
+    startPosition: '起点',
+    endPosition: '终点',
+    taskType: '任务类型'
   }
 }

src/lang/i18n/zh/module/dashboard.js

@@ -0,0 +1,23 @@
+/*
+ * @Author: gtz
+ * @Date: 2022-03-15 16:42:34
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-16 20:01:27
+ * @Description: file content
+ * @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
+ */
+
+export default {
+  first: '第一排',
+  second: '第二排',
+  title: 'WMS库存信息',
+  pageHeader: '第',
+  pageFooter: '页',
+  isEmpty: '是否为空',
+  status: '状态',
+  storageBoxCode: '存储箱编码',
+  name: '库位名',
+  attribute: '库位属性',
+  cassetteStatus: '存储箱状态',
+  workOrderNo: '工单号'
+}

src/lang/i18n/zh/module/equipmentManager.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-03-05 10:04:37
- * @LastEditors: Please set LastEditors
+ * @LastEditors: DY
- * @LastEditTime: 2021-07-23 09:13:20
+ * @LastEditTime: 2022-03-03 16:31:16
  * @FilePath: \basic-admin\src\lang\i18n\zh\module\equipmentManager.js
  * @Description:
  */
@@ -19,6 +19,68 @@ export default {
     'Water': '水',
     'Gas': '气'
   },
+  monitoringInfo: {
+    allCycles: '总循环次数',
+    badTimes: '故障次数',
+    time: '时间',
+    MCBF: 'MCBF',
+    previousStatus: '转换前状态',
+    runTime: '开机时长(时)',
+    produceTime: '生产时长(时)',
+    productiveCount: '实际产能',
+    timeRate: '时间开动率',
+    performanceRate: '性能开动率',
+    oee: '综合效率OEE',
+    E10StartTime: 'E10开始时间',
+    E10endTime: 'E10结束时间',
+    laterE10Status: '变化后E10状态',
+    duration: '持续时间',
+    goodsNumbers: '良品数量',
+    noOkNumbers: '不良品数量',
+    onceOkCount: '一次加工良品数量',
+    reworkOkCount: '重工良品数量',
+    GetTimePeriod: '获取时间段',
+    ProductionTimePeriod: '生产时间段',
+    MaintenanceTimes: '维护次数',
+    RunningTime: '运行时长',
+    E10status: 'E10状态',
+    number: '当日生产的数量',
+    yieId: '当日良率',
+    bom: '当日消耗物料',
+    controlState: '控制状态',
+    equipmentName: '设备名称',
+    e10Code: 'E10状态名称',
+    port: '上料位置',
+    recipe: '设备配方',
+    materialName: '物料名称',
+    productCount: '加工数量',
+    spec:	'物料规格',
+    materialNo:	'物料批次号',
+    upTime:	'上料时间',
+    upCount: '上料数量',
+    useCount:	'使用数量',
+    unit:	'单位',
+    eventName: '事件名称',
+    paramName: '参数名称',
+    receiveTime: '获取参数时间',
+    paramValue: '获取参数值',
+    standardFormat: '标准参数模式',
+    paramFormat: '获取参数格式',
+    controlStatus: '设备控制状态',
+    traceDataState: 'Trace Data 开启状态',
+    controlStateUpdateTime: '控制状态更新时间',
+    e10UpdateTime: 'E10更新时间',
+    StateFlg: 'StateFlg',
+    EnableSpooling: 'EnableSpooling',
+    maxspooltransmit: 'maxspooltransmit',
+    spoolingstate: 'spoolingstate',
+    spoolingcountactual: 'spoolingcountactual',
+    SpoolingCountTotal: 'SpoolingCountTotal',
+    F1F3Succ: 'F1F3请求成功',
+    F2F13Succ: 'F2F13请求成功',
+    baseChart: '设备加工基板数量',
+    monitorChart: '设备运行时长'
+  },
   sparepart: {
     'sparepart': '备品备件',
     'code': '备件编号',

src/lang/i18n/zh/module/index.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:12:46
  * @LastEditors: gtz
- * @LastEditTime: 2021-04-22 19:49:47
+ * @LastEditTime: 2022-03-15 16:44:05
  * @Description: file content
  */
 
@@ -17,6 +17,7 @@ import quality from './quality'
 import factory from './factory'
 import formManage from './formManage'
 import report from './report'
+import dashboard from './dashboard'
 
 export default {
   basicData,
@@ -29,5 +30,6 @@ export default {
   quality,
   factory,
   formManage,
-  report
+  report,
+  dashboard
 }

src/lang/i18n/zh/module/quality.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-03-13 13:49:07
  * @LastEditors: zwq
- * @LastEditTime: 2021-04-15 09:58:18
+ * @LastEditTime: 2022-03-04 09:21:04
  * @FilePath: \basic-admin\src\lang\i18n\zh\module\quality.js
  * @Description:
  */
@@ -90,5 +90,10 @@ export default {
     subTitle: '废品分类统计',
     completeWaste: '完全废品',
     CanBeUsedAfterProcessing: '加工可用'
+  },
+  QCPplan: {
+    QCPcode: 'QCP项目编码',
+    getTime: '获取时间',
+    detail: '详情'
   }
 }

src/lang/i18n/zh/module/report.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-04-22 19:48:46
- * @LastEditors: gtz
+ * @LastEditors: fzq
- * @LastEditTime: 2021-04-27 12:13:25
+ * @LastEditTime: 2022-03-18 14:49:43
  * @Description: file content
  */
 
@@ -11,7 +11,35 @@ export default {
     reportName: '报表名称',
     reportSort: '报表分类',
     createTime: '添加时间',
-    operation: '操作'
+    operation: '操作',
+    storageBoxNumber: '存储箱号',
+    queryFiltering: '查询过滤',
+    storageBoxReport: '存储箱报表'
+  },
+  inventory: {
+    code: '存储箱号',
+    status: '存储箱状态',
+    inprocessCode: '完成工序',
+    nextprocessCode: '下一个工序',
+    currentLocation: '当前库位',
+    storeTime: '存放时间',
+    orderName: '工单名',
+    substrateDetails: '详情基板',
+    viewSubstrates: '查看基板',
+    manual: '使用流程',
+    downl: '导出'
+  },
+  substrate: {
+    substrateCode: '基板编码',
+    location: '当前位置',
+    storeTime: '入库时间',
+    substrateStatus: '基板状态',
+    editSubstrate: '编辑基板',
+    interCode: '内部编码',
+    subStorageStatus: '存取状态',
+    load: '上片',
+    unload: '下片',
+    machineHandID: '机械手ID'
   },
   reportSort: {
     all: '全部'

src/layout/components/Navbar.vue

@@ -11,15 +11,10 @@
 
     <div class="right-menu">
 
-      <div v-if="showhome" class="right-menu-back" @click="toHome">
+      <!-- <div v-if="showhome" class="right-menu-back" @click="toHome">
         <svg-icon class="item-icon" icon-class="home" />
         {{ 'navbar.homepage' | i18nFilter }}
-      </div>
+      </div> -->
-      <div class="right-menu-back">
-        <el-badge :value="alarmList.length" class="item" style="line-height: 0; margin: 0 10px;" @click.native="toAlarm">
-          <svg-icon style="width: 24px; height: 24px" class="item-icon" icon-class="alarm" />
-        </el-badge>
-      </div>
 
       <template>
         <lang-select class="right-menu-item hover-effect" />
@@ -27,28 +22,18 @@
       <div v-if="showhome" class="right-menu-back">
         <a href="Lodap.zip"><i class="el-icon-download" /></a>
       </div>
-      <div class="right-menu-back">
+      <!-- <div class="right-menu-back">
         <i class="el-icon-alarm-clock" />
         {{ formatTime }}
-      </div>
+      </div> -->
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="require('@/assets/img/head.png')" class="user-avatar">
-          <div class="avatar-username">{{ username }}</div>
+          <!-- <div class="avatar-username">{{ username }}</div> -->
           <!-- <i class="el-icon-caret-bottom" /> -->
         </div>
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/profile/index">
-            <el-dropdown-item>
-              <svg-icon class="item-icon" icon-class="user" />
-              {{ 'navbar.profile' | i18nFilter }}
-            </el-dropdown-item>
-          </router-link>
-          <el-dropdown-item @click.native="toHome">
-            <svg-icon class="item-icon" icon-class="help" />
-            {{ 'navbar.help' | i18nFilter }}
-          </el-dropdown-item>
           <el-dropdown-item @click.native="logout">
             <svg-icon class="item-icon" icon-class="logout" />
             {{ 'navbar.logOut' | i18nFilter }}
@@ -71,7 +56,6 @@
 <script>
 import axios from 'axios'
 import { mapGetters } from 'vuex'
-import { alarmInfoList } from '@/api/basicData/AlarmManagement/alarmInfo'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import LangSelect from '@/components/LangSelect'
@@ -122,16 +106,9 @@ export default {
       if (val <= 0) {
         this.logout()
       }
-    },
-    $route: function() {
-      this.getAlarm()
     }
   },
   mounted() {
-    this.getAlarm()
-    logoutInterval = setInterval(() => {
-      this.logoutTime -= 1000
-    }, 1000)
     addEventListener('click', this.logoutTimeReset)
     addEventListener('keydown', this.logoutTimeReset)
     addEventListener('visibilitychange', this.visibilitychangeListener)
@@ -192,24 +169,6 @@ export default {
     async toHome() {
       this.$store.dispatch('app/setChoicepart')
       this.$router.push('/')
-    },
-    getAlarm() {
-      alarmInfoList({
-        current: 1,
-        size: 1000,
-        alarmType: '',
-        code: '',
-        alarmGrade: ''
-      }).then(response => {
-        if (response.data.records) {
-          this.alarmList = response.data.records
-        } else {
-          this.alarmList = []
-        }
-      })
-    },
-    toAlarm() {
-      this.$router.push('/AlarmManagement/AlarmInfo')
     }
   }
 }

src/layout/components/Sidebar/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-01-27 10:07:42
- * @LastEditTime: 2021-03-08 11:59:59
+ * @LastEditTime: 2021-12-22 16:06:25
- * @LastEditors: gtz
+ * @LastEditors: zwq
  * @Description: In User Settings Edit
  * @FilePath: \mt-bus-fe\src\layout\components\Sidebar\index.vue
 -->
@@ -31,31 +31,17 @@ import { mapGetters } from 'vuex'
 import Logo from './Logo'
 import SidebarItem from './SidebarItem'
 import variables from '@/styles/variables.scss'
-// import { constantRoutes } from '@/router'
+import { constantRoutes } from '@/router'
-import store from '@/store'
 export default {
   components: { SidebarItem, Logo },
   computed: {
     ...mapGetters([
       'sidebar',
-      'choicepart',
+      'permission_routes',
       'language'
     ]),
-    partList() {
-      const cangoList = []
-      const constantRoutes = store.getters.permission_routes
-      constantRoutes.map(item => {
-        if (!item.hidden && item.meta) {
-          cangoList.push(item)
-        }
-      })
-      const formatList = cangoList.map((item, index) => {
-        return this.setIndex(item, index)
-      })
-      return formatList
-    },
     routeList() {
-      return [this.partList[this.choicepart]]
+      return constantRoutes
     },
     activeMenu() {
       const route = this.$route
@@ -67,6 +53,7 @@ export default {
       return path
     },
     showLogo() {
+      console.log(this.$route)
       return this.$store.state.settings.sidebarLogo
     },
     variables() {
@@ -75,24 +62,6 @@ export default {
     isCollapse() {
       return !this.sidebar.opened
     }
-  },
-  watch: {
-    $route: function(val) {
-      if (val.meta.routeIndex >= 0) {
-        this.$store.dispatch('app/setChoicepart', val.meta.routeIndex)
-      }
-    }
-  },
-  methods: {
-    setIndex(list, index) {
-      list.meta.routeIndex = index
-      if (list.children) {
-        list.children.map(item => {
-          this.setIndex(item, index)
-        })
-      }
-      return list
-    }
   }
 }
 </script>

src/layout/components/TagsView/index.vue

@@ -45,8 +45,8 @@ export default {
       return this.$store.state.tagsView.visitedViews
     },
     routes() {
-      // return this.$store.state.permission.routes
+      return this.$store.state.permission.routes
-      return []
+      // return []
     }
   },
   watch: {

src/permission.js

@@ -1,12 +1,11 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-02-25 09:42:36
+ * @LastEditTime: 2021-12-22 16:13:30
  * @FilePath: \basic-admin\src\permission.js
  * @Description: 路由权限检查
  */
 import router from './router'
-// import { resetRouter } from '@/router'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
@@ -35,38 +34,28 @@ router.beforeEach(async(to, from, next) => {
       next({ path: '/' })
       NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
     } else {
-      const hasRoles = store.getters.menus && store.getters.menus.length > 0
+      // next()
-      console.log('store.getters.menus', store.getters.menus)
+      NProgress.done()
-      console.log('store.getters', store.getters)
+      try {
-      console.log('hasRoles=', hasRoles)
+      //   // generate accessible routes map based on roles
-      if (hasRoles) {
+        // const accessRoutes = await store.dispatch('permission/generateRoutes')
-        console.log('hasRoles=', store.getters.menus)
+        // console.log(accessRoutes)
+        // router.addRoutes(accessRoutes)
         next()
-        NProgress.done()
-      } else {
-        try {
-          //   // generate accessible routes map based on roles
-          const { menus } = await store.dispatch('user/getInfo')
-          console.log(menus)
-          const accessRoutes = await store.dispatch('permission/generateRoutes', menus)
-          console.log('accessRoutes', accessRoutes)
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true })
         // hack method to ensure that addRoutes is complete
         // set the replace: true, so the navigation will not leave a history record
         // next({ ...to, replace: true })
-        } catch (error) {
+      } catch (error) {
         // remove token and go to login page to re-login
-          next(`/login?redirect=${to.path}`)
+        next(`/login?redirect=${to.path}`)
-          await store.dispatch('user/resetToken')
+        await store.dispatch('user/resetToken')
-          Message.error(error || 'Has Error')
+        Message.error(error || 'Has Error')
-          NProgress.done()
+        NProgress.done()
-        }
       }
     }
   } else {
     /* has no token*/
-    console.log('has no token to.path=' + to.path)
+    console.log('to.path=' + to.path)
     console.log('whiteList.indexOf(to.path)=' + whiteList.indexOf(to.path))
     if (whiteList.indexOf(to.path) !== -1) {
       // in the free login whitelist, go directly

src/settings.js

@@ -1,13 +1,13 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: gtz
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-03-08 11:52:17
+ * @LastEditTime: 2021-12-06 14:24:30
  * @FilePath: \basic-admin\src\settings.js
  * @Description:
  */
 
 module.exports = {
-  title: 'ARI MES',
+  title: 'ARI WMS',
 
   /**
    * @type {boolean} true | false

src/store/getters.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-01-29 14:24:20
+ * @LastEditTime: 2021-12-22 11:38:46
  * @FilePath: \basic-admin\src\store\getters.js
  * @Description:
  */
@@ -19,7 +19,6 @@ const getters = {
   introduction: state => state.user.introduction,
   username: state => state.user.username,
   roles: state => state.user.roles,
-  menus: state => state.user.menus,
   permission_routes: state => state.permission.routes
 }
 export default getters

src/store/modules/permission.js

@@ -1,36 +1,38 @@
-import { dynamicRoutes, constantRoutes } from '@/router'
+/*
-import { getListItems } from '@/utils/tree'
+ * @Author: zwq
+ * @Date: 2021-09-18 16:09:08
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-12-22 15:43:46
+ * @Description:
+ */
+import { asyncRoutes, constantRoutes } from '@/router'
 
 /**
  * Use meta.role to determine if the current user has permission
  * @param roles
  * @param route
  */
-function hasPermission(menuList, route) {
+function hasPermission(roles, route) {
-  // if (route.meta && route.meta.roles) {
+  if (route.meta && route.meta.roles) {
-  //   return roles.some(role => route.meta.roles.includes(role))
+    return roles.some(role => route.meta.roles.includes(role))
-  // } else {
+  } else {
-  //   return true
-  // }
-  if (route.hidden) {
     return true
   }
-  return menuList.some(m => route.path === m.h)
 }
 
 /**
  * Filter asynchronous routing tables by recursion
  * @param routes asyncRoutes
- * @param menuList
+ * @param roles
  */
-export function filterAsyncRoutes(routes, menuList) {
+export function filterAsyncRoutes(routes, roles) {
   const res = []
 
   routes.forEach(route => {
     const tmp = { ...route }
-    if (hasPermission(menuList, tmp)) {
+    if (hasPermission(roles, tmp)) {
       if (tmp.children) {
-        tmp.children = filterAsyncRoutes(tmp.children, menuList)
+        tmp.children = filterAsyncRoutes(tmp.children, roles)
       }
       res.push(tmp)
     }
@@ -52,19 +54,13 @@ const mutations = {
 }
 
 const actions = {
-  generateRoutes({ commit }, menus) {
+  generateRoutes({ commit }, roles) {
     return new Promise(resolve => {
       let accessedRoutes
-      console.log(menus)
+      if (roles.includes('admin')) {
-      if (!menus) {
+        accessedRoutes = asyncRoutes || []
-        accessedRoutes = []
       } else {
-        const menuList = []
+        accessedRoutes = filterAsyncRoutes(asyncRoutes, roles)
-        getListItems(menus, node => menuList.push(node))
-        console.log(menuList)
-        console.log(dynamicRoutes)
-        accessedRoutes = filterAsyncRoutes(dynamicRoutes, menuList)
-        console.log(accessedRoutes)
       }
       commit('SET_ROUTES', accessedRoutes)
       resolve(accessedRoutes)

src/store/modules/user.js

@@ -9,7 +9,6 @@ const state = {
   avatar: '',
   introduction: '',
   roles: [],
-  menus: [],
   username: Cookies.get('username') || ''
 }
 
@@ -26,9 +25,6 @@ const mutations = {
   SET_AVATAR: (state, avatar) => {
     state.avatar = avatar
   },
-  SET_MENUS: (state, menus) => {
-    state.menus = menus
-  },
   SET_ROLES: (state, roles) => {
     state.roles = roles
   },
@@ -42,7 +38,7 @@ const actions = {
   login({ commit }, userInfo) {
     const { username, password } = userInfo
     return new Promise((resolve, reject) => {
-      login({ mobile: username.trim(), password: password }).then(res => {
+      login({ mobile: String(username).trim(), password }).then(res => {
         console.log(res)
         if (res.code === 0) {
           const { token, name } = res.data
@@ -70,17 +66,16 @@ const actions = {
           reject('Verification failed, please Login again.')
         }
 
-        const { roles, name, avatar, introduction, menus } = data
+        const { roles, name, avatar, introduction } = data
 
         // roles must be a non-empty array
-        if (!menus || menus.length <= 0) {
+        if (!roles || roles.length <= 0) {
-          reject('getInfo: menus must be a non-null array!')
+          reject('getInfo: roles must be a non-null array!')
         }
 
-        commit('SET_ROLES', roles || [])
+        commit('SET_ROLES', roles)
         commit('SET_NAME', name)
         commit('SET_AVATAR', avatar)
-        commit('SET_MENUS', menus)
         commit('SET_INTRODUCTION', introduction)
         resolve(data)
       }).catch(error => {
@@ -97,7 +92,6 @@ const actions = {
       dispatch('tagsView/delAllViews', null, { root: true })
       commit('SET_TOKEN', '')
       commit('SET_ROLES', [])
-      commit('SET_MENUS', [])
       commit('SET_USERNAME')
       Cookies.set('username', '')
       localStorage.clear()

src/styles/index.scss

@@ -198,3 +198,40 @@ aside {
 .el-dialog__wrapper {
   backdrop-filter: blur(5px);
 }
+
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+  background-color: transparent;
+}
+
+::-webkit-scrollbar-track-piece {
+  background-color:rgba(144,147,153,0);
+}
+
+::-webkit-scrollbar-corner {
+  background-color:rgba(144,147,153,0);
+}
+
+::-webkit-scrollbar-track {
+  width: 6px;
+  background: rgba(144,147,153,0);
+  -webkit-border-radius: 2em;
+  -moz-border-radius: 2em;
+  border-radius: 2em;
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: rgba(144,147,153,.5);
+  background-clip: padding-box;
+  min-height: 28px;
+  -webkit-border-radius: 2em;
+  -moz-border-radius: 2em;
+  border-radius: 2em;
+  transition: background-color .3s;
+  cursor: pointer;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background-color: rgba(144,147,153,.3);
+}

src/views/EquipmentManager/equipmentUtilizationRate/E10.vue

@@ -0,0 +1,152 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-16 15:41:11
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:04:30
+ * @Description: E10
+-->
+<template>
+  <div class="app-container">
+    <el-form
+      :model="formData"
+      :inline="true"
+      size="medium"
+      label-width="80px"
+    >
+      <el-form-item>
+        <el-button type="primary" @click="toE10()">E10</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toOEE()">OEE</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toMTTR()">MTTR</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toMCBF()">MCBF</el-button>
+      </el-form-item>
+      <!-- <el-form-item :label="$t('module.equipmentManager.recipe.equipmentId')" prop="equipmentName">
+        <el-select v-model="formData.equipmentName" :placeholder="$t('module.equipmentManager.recipe.EQselect')" filterable clearable>
+          <el-option
+            v-for="(item, index) in eqList"
+            :key="index"
+            :label="item.name"
+            :value="item.name"
+          />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item :label="$t('module.equipmentManager.equipmentVisualization.timeSlot')" label-width="100px" prop="time">
+        <el-date-picker
+          v-model="formData.timeSlot"
+          type="datetimerange"
+          :start-placeholder="$t('module.orderManage.order.StartTime')"
+          :end-placeholder="$t('module.orderManage.order.StartTime')"
+          :range-separator="$t('module.orderManage.order.To')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.exportBtn' | i18nFilter }} </el-button>
+      </el-form-item> -->
+    </el-form>
+    <e10Chart v-if="e10Visible" ref="e10Chart" :time1="startTime" :time2="endTime" :name="formData.equipmentName" @equipmentName="seeDetail" />
+    <e10-detail-chart v-if="e10Detail" ref="e10DetailChart" :time1="startTime" :time2="endTime" :equipment-name="equipmentName" />
+  </div>
+</template>
+
+<script>
+import e10Chart from './components/e10-chart'
+import e10DetailChart from './components/e10Detail-chart'
+// import { equipmentList } from '@/api/basicData/Equipment/equipmentInfo'
+
+export default {
+  name: 'E10',
+  components: { e10Chart, e10DetailChart },
+  data() {
+    return {
+      list: [],
+      startTime: '',
+      endTime: '',
+      formData: {
+        timeSlot: [],
+        equipmentName: undefined,
+        current: 1,
+        size: 10
+      },
+      e10Visible: false,
+      e10Detail: false,
+      equipmentName: '',
+      eqList: []
+    }
+  },
+  created() {
+    // this.getEqList()
+    // this.getList()
+  },
+  methods: {
+    // async getEqList() {
+    //   const res = await equipmentList({
+    //     current: 1,
+    //     size: 999
+    //   })
+    //   if (res.code === 0) {
+    //     this.eqList = res.data
+    //   }
+    // },
+    toE10() {
+      this.$router.push({
+        name: 'E10'
+      })
+    },
+    toOEE() {
+      this.$router.push({
+        name: 'OEE'
+      })
+    },
+    toMTTR() {
+      this.$router.push({
+        name: 'MTTR'
+      })
+    },
+    toMCBF() {
+      this.$router.push({
+        name: 'MCBF'
+      })
+    },
+    seeDetail(name) {
+      this.equipmentName = name
+      this.e10Visible = false
+      this.e10Detail = true
+      setTimeout(() => {
+        this.$refs.e10DetailChart.getList()
+      }, 60)
+    },
+    getList() {
+      if (this.formData.timeSlot.length !== 0) {
+        this.startTime = this.formData.timeSlot[0]
+        this.endTime = this.formData.timeSlot[1]
+        this.$nextTick(() => {
+          this.e10Visible = true
+          setTimeout(() => {
+            this.$refs.e10Chart.getList()
+          }, 60)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue

@@ -0,0 +1,151 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-16 15:41:11
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:04:19
+ * @Description: MCBF
+-->
+<template>
+  <div class="app-container">
+    <el-form
+      :model="formData"
+      :inline="true"
+      size="medium"
+      label-width="80px"
+    >
+      <el-form-item>
+        <el-button @click="toE10()">E10</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toOEE()">OEE</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toMTTR()">MTTR</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="toMCBF()">MCBF</el-button>
+      </el-form-item>
+      <!-- <el-form-item :label="$t('module.equipmentManager.recipe.equipmentId')" prop="equipmentName">
+        <el-select v-model="formData.equipmentName" :placeholder="$t('module.equipmentManager.recipe.EQselect')" filterable clearable>
+          <el-option
+            v-for="(item, index) in eqList"
+            :key="index"
+            :label="item.name"
+            :value="item.name"
+          />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item :label="$t('module.equipmentManager.equipmentVisualization.timeSlot')" label-width="100px" prop="time">
+        <el-date-picker
+          v-model="formData.timeSlot"
+          type="datetimerange"
+          :start-placeholder="$t('module.orderManage.order.StartTime')"
+          :end-placeholder="$t('module.orderManage.order.StartTime')"
+          :range-separator="$t('module.orderManage.order.To')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.exportBtn' | i18nFilter }} </el-button>
+      </el-form-item> -->
+    </el-form>
+    <mcbfChart v-if="mcbfVisible" ref="mcbfChart" :time1="startTime" :time2="endTime" @equipmentName="seeDetail" />
+    <mcbf-detail-chart v-if="mcbfDetail" ref="mcbfDetailChart" :time1="startTime" :time2="endTime" :equipment-name="equipmentName" />
+  </div>
+</template>
+
+<script>
+import mcbfChart from './components/mcbf-chart'
+import mcbfDetailChart from './components/mcbfDetail-chart'
+// import { equipmentList } from '@/api/basicData/Equipment/equipmentInfo'
+
+export default {
+  name: 'MCBF',
+  components: { mcbfChart, mcbfDetailChart },
+  data() {
+    return {
+      list: [],
+      startTime: '',
+      endTime: '',
+      formData: {
+        timeSlot: [],
+        current: 1,
+        size: 10
+      },
+      mcbfVisible: false,
+      mcbfDetail: false,
+      equipmentName: '',
+      eqList: []
+    }
+  },
+  created() {
+    // this.getEqList()
+    // this.getList()
+  },
+  methods: {
+    // async getEqList() {
+    //   const res = await equipmentList({
+    //     current: 1,
+    //     size: 999
+    //   })
+    //   if (res.code === 0) {
+    //     this.eqList = res.data
+    //   }
+    // },
+    toE10() {
+      this.$router.push({
+        name: 'E10'
+      })
+    },
+    toOEE() {
+      this.$router.push({
+        name: 'OEE'
+      })
+    },
+    toMTTR() {
+      this.$router.push({
+        name: 'MTTR'
+      })
+    },
+    toMCBF() {
+      this.$router.push({
+        name: 'MCBF'
+      })
+    },
+    seeDetail(name) {
+      this.equipmentName = name
+      this.mcbfVisible = false
+      this.mcbfDetail = true
+      setTimeout(() => {
+        this.$refs.mcbfDetailChart.getList()
+      }, 60)
+    },
+    getList() {
+      if (this.formData.timeSlot.length !== 0) {
+        this.startTime = this.formData.timeSlot[0]
+        this.endTime = this.formData.timeSlot[1]
+        this.$nextTick(() => {
+          this.mcbfVisible = true
+          setTimeout(() => {
+            this.$refs.mcbfChart.getList()
+          }, 60)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue

@@ -0,0 +1,151 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-16 15:41:11
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:04:09
+ * @Description: MTTR
+-->
+<template>
+  <div class="app-container">
+    <el-form
+      :model="formData"
+      :inline="true"
+      size="medium"
+      label-width="80px"
+    >
+      <el-form-item>
+        <el-button @click="toE10()">E10</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toOEE()">OEE</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="toMTTR()">MTTR</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toMCBF()">MCBF</el-button>
+      </el-form-item>
+      <!-- <el-form-item :label="$t('module.equipmentManager.recipe.equipmentId')" prop="equipmentName">
+        <el-select v-model="formData.equipmentName" :placeholder="$t('module.equipmentManager.recipe.EQselect')" filterable clearable>
+          <el-option
+            v-for="(item, index) in eqList"
+            :key="index"
+            :label="item.name"
+            :value="item.name"
+          />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item :label="$t('module.equipmentManager.equipmentVisualization.timeSlot')" label-width="100px" prop="time">
+        <el-date-picker
+          v-model="formData.timeSlot"
+          type="datetimerange"
+          :start-placeholder="$t('module.orderManage.order.StartTime')"
+          :end-placeholder="$t('module.orderManage.order.StartTime')"
+          :range-separator="$t('module.orderManage.order.To')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.exportBtn' | i18nFilter }} </el-button>
+      </el-form-item> -->
+    </el-form>
+    <mttrChart v-if="mttrVisible" ref="mttrChart" :time1="startTime" :time2="endTime" @equipmentName="seeDetail" />
+    <mttr-detail-chart v-if="mttrDetail" ref="mttrDetailChart" :time1="startTime" :time2="endTime" :equipment-name="equipmentName" />
+  </div>
+</template>
+
+<script>
+import mttrChart from './components/mttr-chart'
+import mttrDetailChart from './components/mttrDetail-chart'
+// import { equipmentList } from '@/api/basicData/Equipment/equipmentInfo'
+
+export default {
+  name: 'MTTR',
+  components: { mttrChart, mttrDetailChart },
+  data() {
+    return {
+      list: [],
+      startTime: '',
+      endTime: '',
+      formData: {
+        timeSlot: [],
+        current: 1,
+        size: 10
+      },
+      mttrVisible: false,
+      mttrDetail: false,
+      equipmentName: '',
+      eqList: []
+    }
+  },
+  created() {
+    // this.getEqList()
+    // this.getList()
+  },
+  methods: {
+    // async getEqList() {
+    //   const res = await equipmentList({
+    //     current: 1,
+    //     size: 999
+    //   })
+    //   if (res.code === 0) {
+    //     this.eqList = res.data
+    //   }
+    // },
+    toE10() {
+      this.$router.push({
+        name: 'E10'
+      })
+    },
+    toOEE() {
+      this.$router.push({
+        name: 'OEE'
+      })
+    },
+    toMTTR() {
+      this.$router.push({
+        name: 'MTTR'
+      })
+    },
+    toMCBF() {
+      this.$router.push({
+        name: 'MCBF'
+      })
+    },
+    seeDetail(name) {
+      this.equipmentName = name
+      this.mttrVisible = false
+      this.mttrDetail = true
+      setTimeout(() => {
+        this.$refs.mttrDetailChart.getList()
+      }, 60)
+    },
+    getList() {
+      if (this.formData.timeSlot.length !== 0) {
+        this.startTime = this.formData.timeSlot[0]
+        this.endTime = this.formData.timeSlot[1]
+        this.$nextTick(() => {
+          this.mttrVisible = true
+          setTimeout(() => {
+            this.$refs.mttrChart.getList()
+          }, 60)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue

@@ -0,0 +1,151 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-16 15:41:11
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:03:58
+ * @Description: OEE
+-->
+<template>
+  <div class="app-container">
+    <el-form
+      :model="formData"
+      :inline="true"
+      size="medium"
+      label-width="80px"
+    >
+      <el-form-item>
+        <el-button @click="toE10()">E10</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="toOEE()">OEE</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toMTTR()">MTTR</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="toMCBF()">MCBF</el-button>
+      </el-form-item>
+      <!-- <el-form-item :label="$t('module.equipmentManager.recipe.equipmentId')" prop="equipmentName">
+        <el-select v-model="formData.equipmentName" :placeholder="$t('module.equipmentManager.recipe.EQselect')" filterable clearable>
+          <el-option
+            v-for="(item, index) in eqList"
+            :key="index"
+            :label="item.name"
+            :value="item.name"
+          />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item :label="$t('module.equipmentManager.equipmentVisualization.timeSlot')" label-width="100px" prop="time">
+        <el-date-picker
+          v-model="formData.timeSlot"
+          type="datetimerange"
+          :start-placeholder="$t('module.orderManage.order.StartTime')"
+          :end-placeholder="$t('module.orderManage.order.StartTime')"
+          :range-separator="$t('module.orderManage.order.To')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.exportBtn' | i18nFilter }} </el-button>
+      </el-form-item> -->
+    </el-form>
+    <oeeChart v-if="oeeVisible" ref="oeeChart" :time1="startTime" :time2="endTime" @equipmentName="seeDetail" />
+    <oee-detail-chart v-if="oeeDetail" ref="oeeDetailChart" :time1="startTime" :time2="endTime" :equipment-name="equipmentName" />
+  </div>
+</template>
+
+<script>
+import oeeChart from './components/oee-chart'
+import oeeDetailChart from './components/oeeDetail-chart'
+// import { equipmentList } from '@/api/basicData/Equipment/equipmentInfo'
+
+export default {
+  name: 'OEE',
+  components: { oeeChart, oeeDetailChart },
+  data() {
+    return {
+      list: [],
+      startTime: '',
+      endTime: '',
+      formData: {
+        timeSlot: [],
+        current: 1,
+        size: 10
+      },
+      oeeVisible: false,
+      oeeDetail: false,
+      equipmentName: '',
+      eqList: []
+    }
+  },
+  created() {
+    // this.getEqList()
+    // this.getList()
+  },
+  methods: {
+    // async getEqList() {
+    //   const res = await equipmentList({
+    //     current: 1,
+    //     size: 999
+    //   })
+    //   if (res.code === 0) {
+    //     this.eqList = res.data
+    //   }
+    // },
+    toE10() {
+      this.$router.push({
+        name: 'E10'
+      })
+    },
+    toOEE() {
+      this.$router.push({
+        name: 'OEE'
+      })
+    },
+    toMTTR() {
+      this.$router.push({
+        name: 'MTTR'
+      })
+    },
+    toMCBF() {
+      this.$router.push({
+        name: 'MCBF'
+      })
+    },
+    seeDetail(name) {
+      this.equipmentName = name
+      this.oeeVisible = false
+      this.oeeDetail = true
+      setTimeout(() => {
+        this.$refs.oeeDetailChart.getList()
+      }, 60)
+    },
+    getList() {
+      if (this.formData.timeSlot.length !== 0) {
+        this.startTime = this.formData.timeSlot[0]
+        this.endTime = this.formData.timeSlot[1]
+        this.$nextTick(() => {
+          this.oeeVisible = true
+          setTimeout(() => {
+            this.$refs.oeeChart.getList()
+          }, 60)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/EquipmentManager/equipmentUtilizationRate/components/E10Table.vue

@@ -0,0 +1,134 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 15:41:11
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:03:35
+ * @Description: E10详情表格
+-->
+<template>
+  <div>
+    <base-table
+      :page="listQuery.current"
+      :limit="listQuery.size"
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    />
+    <pagination :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" @pagination="init" />
+  </div>
+</template>
+
+<script>
+import i18n from '@/lang'
+import BaseTable from '@/components/BaseTable'
+import Pagination from '@/components/Pagination'
+import { timeFormatter } from '@/filters'
+// import { getE10StackDetail } from '@/api/equipment/infoPandect'
+
+/**
+ * 表格表头配置项 TypeScript接口注释
+ * tableConfig<ConfigItem> = []
+ *
+ * Interface ConfigItem = {
+ *  prop: string,
+ *  label: string,
+ *  width: string,
+ *  align: string,
+ *  subcomponent: function,
+ *  filter: function
+ * }
+ *
+ *
+ */
+const tableProps = [
+  {
+    prop: 'equipmentName',
+    label: i18n.t('module.equipmentManager.maintainplan.equipmentId'),
+    align: 'center'
+  }, {
+    prop: 'status',
+    label: i18n.t('module.equipmentManager.monitoringInfo.E10status'),
+    align: 'center'
+  }, {
+    prop: 'previousStatus',
+    label: i18n.t('module.equipmentManager.monitoringInfo.laterE10Status'),
+    align: 'center'
+  }, {
+    prop: 'endTime',
+    label: i18n.t('module.equipmentManager.monitoringInfo.E10endTime'),
+    filter: timeFormatter,
+    align: 'center'
+  }, {
+    prop: 'durationTime',
+    label: i18n.t('module.equipmentManager.monitoringInfo.duration'),
+    align: 'center'
+  }
+]
+
+export default {
+  name: '',
+  components: { BaseTable, Pagination },
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    equipmentName: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      total: 0,
+      tableProps,
+      list: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10
+      }
+    }
+  },
+  mounted() {
+    // this.init()
+  },
+  methods: {
+    init() {
+      this.listQuery.startTime = this.time1
+      this.listQuery.endTime = this.time2
+      this.listQuery.equipmentName = this.equipmentName
+      // getE10StackDetail(this.listQuery).then(res => {
+      //   if (res.data !== []) {
+      //     this.list = res.data.detail.records
+      //     this.total = res.data.detail.total
+      //     this.list.forEach(item => {
+      //       item.equipmentName = this.equipmentName
+      //     })
+      //   }
+      // })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/EquipmentManager/equipmentUtilizationRate/components/McbfTable.vue

@@ -0,0 +1,94 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 15:41:11
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:47:23
+ * @Description: MCBF详情表格
+-->
+<template>
+  <div>
+    <base-table
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    />
+  </div>
+</template>
+
+<script>
+import i18n from '@/lang'
+import BaseTable from '@/components/BaseTable'
+
+/**
+ * 表格表头配置项 TypeScript接口注释
+ * tableConfig<ConfigItem> = []
+ *
+ * Interface ConfigItem = {
+ *  prop: string,
+ *  label: string,
+ *  width: string,
+ *  align: string,
+ *  subcomponent: function,
+ *  filter: function
+ * }
+ *
+ *
+ */
+const tableProps = [
+  {
+    prop: 'tmc',
+    label: i18n.t('module.equipmentManager.monitoringInfo.allCycles'),
+    align: 'center'
+  }, {
+    prop: 'emc',
+    label: i18n.t('module.equipmentManager.monitoringInfo.badTimes'),
+    align: 'center'
+  }, {
+    prop: 'time',
+    label: i18n.t('module.equipmentManager.monitoringInfo.time'),
+    align: 'center'
+  }, {
+    prop: 'mtbf',
+    label: i18n.t('module.equipmentManager.monitoringInfo.MCBF'),
+    align: 'center'
+  }
+]
+
+export default {
+  name: '',
+  components: { BaseTable },
+  props: {
+    tableData: {
+      type: Array,
+      default: () => { [] }
+    }
+  },
+  data() {
+    return {
+      total: 0,
+      tableProps,
+      list: [],
+      listLoading: false
+    }
+  },
+  mounted() {
+    // this.init()
+  },
+  methods: {
+    init() {
+      this.list = this.tableData
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/EquipmentManager/equipmentUtilizationRate/components/MttrTable.vue

@@ -0,0 +1,132 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 15:41:11
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:03:23
+ * @Description: Mttr详情表格
+-->
+<template>
+  <div>
+    <base-table
+      :page="listQuery.current"
+      :limit="listQuery.size"
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    />
+    <pagination :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" @pagination="init" />
+  </div>
+</template>
+
+<script>
+import i18n from '@/lang'
+import BaseTable from '@/components/BaseTable'
+import Pagination from '@/components/Pagination'
+import { timeFormatter } from '@/filters'
+// import { getMttrDetail } from '@/api/equipment/infoPandect'
+
+/**
+ * 表格表头配置项 TypeScript接口注释
+ * tableConfig<ConfigItem> = []
+ *
+ * Interface ConfigItem = {
+ *  prop: string,
+ *  label: string,
+ *  width: string,
+ *  align: string,
+ *  subcomponent: function,
+ *  filter: function
+ * }
+ *
+ *
+ */
+const tableProps = [
+  {
+    prop: 'previousStatus',
+    label: i18n.t('module.equipmentManager.monitoringInfo.previousStatus'),
+    align: 'center'
+  }, {
+    prop: 'status',
+    label: i18n.t('module.art.status'),
+    align: 'center'
+  }, {
+    prop: 'startTime',
+    label: i18n.t('module.equipmentManager.equipmentParams.startTime'),
+    filter: timeFormatter,
+    align: 'center'
+  }, {
+    prop: 'endTime',
+    label: i18n.t('module.equipmentManager.equipmentParams.endTime'),
+    filter: timeFormatter,
+    align: 'center'
+  }, {
+    prop: 'durationTime',
+    label: i18n.t('module.equipmentManager.monitoringInfo.duration'),
+    align: 'center'
+  }
+]
+
+export default {
+  name: '',
+  components: { BaseTable, Pagination },
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    equipmentName: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      total: 0,
+      tableProps,
+      list: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10
+      }
+    }
+  },
+  mounted() {
+    // this.init()
+  },
+  methods: {
+    init() {
+      this.listQuery.startTime = this.time1
+      this.listQuery.endTime = this.time2
+      this.listQuery.equipmentName = this.equipmentName
+      // getMttrDetail(this.listQuery).then(res => {
+      //   if (res.data !== []) {
+      //     this.list = res.data.detail.records
+      //     this.total = res.data.detail.total
+      //   }
+      // })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/EquipmentManager/equipmentUtilizationRate/components/OeeTable.vue

@@ -0,0 +1,100 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 15:41:11
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:38:52
+ * @Description: OEE详情表格
+-->
+<template>
+  <div>
+    <base-table
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    />
+  </div>
+</template>
+
+<script>
+import i18n from '@/lang'
+import BaseTable from '@/components/BaseTable'
+
+const tableProps = [
+  {
+    prop: 'equipmentName',
+    label: i18n.t('module.equipmentManager.maintainplan.equipmentId'),
+    align: 'center'
+  }, {
+    prop: 'runTime',
+    label: i18n.t('module.equipmentManager.monitoringInfo.runTime'),
+    align: 'center'
+  }, {
+    prop: 'productiveTime',
+    label: i18n.t('module.equipmentManager.monitoringInfo.produceTime'),
+    align: 'center'
+  }, {
+    prop: 'productiveCount',
+    label: i18n.t('module.equipmentManager.monitoringInfo.productiveCount'),
+    align: 'center'
+  }, {
+    prop: 'timeRate',
+    label: i18n.t('module.equipmentManager.monitoringInfo.timeRate'),
+    align: 'center'
+  }, {
+    prop: 'performanceRate',
+    label: i18n.t('module.equipmentManager.monitoringInfo.performanceRate'),
+    align: 'center'
+  }, {
+    prop: 'oee',
+    label: i18n.t('module.equipmentManager.monitoringInfo.oee'),
+    align: 'center'
+  }
+]
+
+export default {
+  name: '',
+  components: { BaseTable },
+  props: {
+    tableData: {
+      type: Array,
+      default: () => { [] }
+    },
+    equipmentName: {
+      type: String,
+      default: () => { '' }
+    }
+  },
+  data() {
+    return {
+      total: 0,
+      tableProps,
+      list: [],
+      listLoading: false
+    }
+  },
+  mounted() {
+    // this.init()
+  },
+  methods: {
+    init() {
+      this.list = this.tableData
+      if (this.list !== []) {
+        this.list.forEach(item => {
+          item.equipmentName = this.equipmentName
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/EquipmentManager/equipmentUtilizationRate/components/e10-chart.vue

@@ -0,0 +1,212 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-13 16:39:34
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 15:43:32
+ * @Description: E10折线柱状图
+-->
+<template>
+  <div>
+    <div id="monitorChart" :style="{width: '1000px', height: '800px'}" style="margin-left:10%" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+// import { getE10Stack } from '@/api/equipment/infoPandect'
+
+export default {
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    name: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      list: [],
+      xDataList: [],
+      engineeringList: [],
+      nonscheduledDownList: [],
+      productiveList: [],
+      rampUpDownList: [],
+      scheduledDownList: [],
+      standByList: [],
+      unscheduledDownList: []
+    }
+  },
+  mounted() {},
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    removeData() {
+      this.xDataList = ['ACOT1', 'ACOT2']
+      this.engineeringList = [20, 30]
+      this.nonscheduledDownList = [20, 20]
+      this.productiveList = [10, 2]
+      this.rampUpDownList = [30, 3]
+      this.scheduledDownList = [8, 15]
+      this.standByList = [2, 12]
+      this.unscheduledDownList = [10, 18]
+    },
+    getList() {
+      this.removeData()
+      this.init()
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById('monitorChart'))
+      const that = this
+      that.chart.on('click', function(params) {
+        that.$emit('equipmentName', params.name)
+      })
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          axisLabel: {
+            interval: 0,
+            rotate: -30
+          },
+          max: 10,
+          data: this.xDataList
+        },
+        yAxis: {
+          type: 'value',
+          min: 0,
+          max: 100,
+          axisLabel: {
+            formatter: '{value}%'
+          }
+        },
+        series: [
+          {
+            name: 'engineering',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            barWidth: 40,
+            data: this.engineeringList
+          },
+          {
+            name: 'nonscheduledDown',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.nonscheduledDownList
+          },
+          {
+            name: 'productive',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.productiveList
+          },
+          {
+            name: 'rampUpDown',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.rampUpDownList
+          },
+          {
+            name: 'scheduledDown',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.scheduledDownList
+          },
+          {
+            name: 'standBy',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.standByList
+          },
+          {
+            name: 'unscheduledDown',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.unscheduledDownList
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/EquipmentManager/equipmentUtilizationRate/components/e10Detail-chart.vue

@@ -0,0 +1,253 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-13 16:39:34
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:26:34
+ * @Description: E10详情堆积图
+-->
+<template>
+  <div>
+    <div>
+      <el-button-group>
+        <el-button @click="byYear">年</el-button>
+        <el-button @click="byQuarterly">季度</el-button>
+        <el-button @click="byMonth">月</el-button>
+        <el-button @click="byWeek">周</el-button>
+        <el-button @click="byDay">天</el-button>
+      </el-button-group>
+    </div>
+    <div id="monitorChart" :style="{width: '700px', height: '550px'}" style="margin-left:10%" />
+    <e10-table v-if="tableVisible" :time1="startTime" :time2="endTime" :equipment-name="name" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+// import { getE10StackDetail } from '@/api/equipment/infoPandect'
+import E10Table from './E10Table'
+
+export default {
+  components: { E10Table },
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    equipmentName: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      tableVisible: false,
+      equipmentDetail: [],
+      list: [],
+      xDataList: [],
+      engineeringList: [],
+      nonscheduledDownList: [],
+      productiveList: [],
+      rampUpDownList: [],
+      scheduledDownList: [],
+      standByList: [],
+      unscheduledDownList: [],
+      startTime: '',
+      endTime: '',
+      name: ''
+    }
+  },
+  mounted() {
+    this.startTime = this.time1
+    this.endTime = this.time2
+    this.name = this.equipmentName
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    getDataList(params) {
+      console.log(params)
+    },
+    byYear() {
+      this.removeData()
+      this.setChart(this.list.年)
+    },
+    byQuarterly() {
+      this.removeData()
+      this.setChart(this.list.季度)
+    },
+    byMonth() {
+      this.removeData()
+      this.setChart(this.list.月)
+    },
+    byWeek() {
+      this.removeData()
+      this.setChart(this.list.周)
+    },
+    byDay() {
+      this.removeData()
+      this.setChart(this.list.天)
+    },
+    setChart(list) {
+      this.init()
+    },
+    removeData() {
+      // this.xDataList = [this.name]
+      this.engineeringList = [20]
+      this.nonscheduledDownList = [20]
+      this.productiveList = [10]
+      this.rampUpDownList = [30]
+      this.scheduledDownList = [8]
+      this.standByList = [2]
+      this.unscheduledDownList = [10]
+    },
+    getList() {
+      this.xDataList = [this.name]
+      this.tableVisible = true
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById('monitorChart'))
+
+      this.chart.on('click', function(params) {
+        console.log('113d', params.name)
+      })
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          max: 10,
+          axisLabel: {
+            interval: 0,
+            rotate: -30
+          },
+          data: this.xDataList
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: 'engineering',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.engineeringList
+          },
+          {
+            name: 'nonscheduledDown',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.nonscheduledDownList
+          },
+          {
+            name: 'productive',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.productiveList
+          },
+          {
+            name: 'rampUpDown',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.rampUpDownList
+          },
+          {
+            name: 'scheduledDown',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.scheduledDownList
+          },
+          {
+            name: 'standBy',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.standByList
+          },
+          {
+            name: 'unscheduledDown',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.unscheduledDownList
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/EquipmentManager/equipmentUtilizationRate/components/mcbf-chart.vue

@@ -0,0 +1,137 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-13 16:39:34
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:48:01
+ * @Description: Mcbf折线柱状图
+-->
+<template>
+  <div>
+    <div id="monitorChart" :style="{width: '1000px', height: '800px'}" style="margin-left:10%" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+// import { getAllMtbf } from '@/api/equipment/infoPandect'
+
+export default {
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      list: [],
+      xDataList: [],
+      yDataList: []
+    }
+  },
+  mounted() {},
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    removeData() {
+      this.xDataList = ['ACOT1', 'ACOT2', 'ACOT-a', 'ACOT-b']
+      this.yDataList = [22, 40, 66, 44]
+    },
+    getList() {
+      this.removeData()
+      this.init()
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById('monitorChart'))
+      const that = this
+      that.chart.on('click', function(params) {
+        that.$emit('equipmentName', params.name)
+      })
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          axisLabel: {
+            interval: 0,
+            rotate: -30
+          },
+          max: 10,
+          data: this.xDataList
+        },
+        yAxis: [{
+          type: 'value',
+          min: 0,
+          max: 100,
+          axisLabel: {
+            formatter: '{value}次'
+          }
+        },
+        {
+          type: 'value',
+          min: 0,
+          max: 100,
+          axisLabel: {
+            formatter: '{value}次'
+          }
+        }
+        ],
+        series: [
+          {
+            name: '稼动率值',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            barWidth: 40,
+            data: this.yDataList
+          },
+          {
+            name: '稼动率值',
+            type: 'line',
+            yAxisIndex: 1,
+            data: this.yDataList
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/EquipmentManager/equipmentUtilizationRate/components/mcbfDetail-chart.vue

@@ -0,0 +1,185 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-13 16:39:34
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:48:53
+ * @Description: MCBF详情堆积图
+-->
+<template>
+  <div>
+    <div>
+      <el-button-group>
+        <el-button @click="byYear">年</el-button>
+        <el-button @click="byQuarterly">季度</el-button>
+        <el-button @click="byMonth">月</el-button>
+        <el-button @click="byWeek">周</el-button>
+        <el-button @click="byDay">天</el-button>
+      </el-button-group>
+    </div>
+    <div id="monitorChart" :style="{width: '700px', height: '550px'}" style="margin-left:10%" />
+    <mcbf-table v-if="tableVisible" ref="tableRef" :table-data="tableData" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+// import { getMcbfDetail } from '@/api/equipment/infoPandect'
+import McbfTable from './McbfTable'
+
+export default {
+  components: { McbfTable },
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    equipmentName: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      tableVisible: false,
+      tableData: [],
+      equipmentDetail: [],
+      list: [],
+      xDataList: [],
+      yDataList: [],
+      startTime: '',
+      endTime: '',
+      name: ''
+    }
+  },
+  mounted() {
+    this.startTime = this.time1
+    this.endTime = this.time2
+    this.name = this.equipmentName
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    getDataList(params) {
+      console.log(params)
+    },
+    byYear() {
+      this.removeData()
+      this.setChart(this.list.年)
+      this.tableData = this.list.年
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    byQuarterly() {
+      this.removeData()
+      this.setChart(this.list.季度)
+      this.tableData = this.list.季度
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    byMonth() {
+      this.removeData()
+      this.setChart(this.list.月)
+      this.tableData = this.list.月
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    byWeek() {
+      this.removeData()
+      this.setChart(this.list.周)
+      this.tableData = this.list.周
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    byDay() {
+      this.removeData()
+      this.setChart(this.list.天)
+      this.tableData = this.list.天
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    setChart(list) {
+      this.init()
+    },
+    removeData() {
+      this.xDataList = [this.name]
+      this.yDataList = [11, 33, 20, 53, 24]
+    },
+    getList() {
+      this.tableVisible = true
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById('monitorChart'))
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          max: 10,
+          axisLabel: {
+            interval: 0,
+            rotate: -30
+          },
+          data: this.xDataList
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: '稼动率值',
+            type: 'line',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.yDataList
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/EquipmentManager/equipmentUtilizationRate/components/mttr-chart.vue

@@ -0,0 +1,133 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-13 16:39:34
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:41:38
+ * @Description: MTTR折线柱状图
+-->
+<template>
+  <div>
+    <div id="monitorChart" :style="{width: '1000px', height: '800px'}" style="margin-left:10%" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+// import { getMttr } from '@/api/equipment/infoPandect'
+
+export default {
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      list: [],
+      xDataList: [],
+      yDataList: []
+    }
+  },
+  mounted() {},
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    removeData() {
+      this.xDataList = ['ACOT1', 'ACOT2', 'ACOT-a', 'ACOT-b']
+      this.yDataList = [22, 40, 66, 44]
+    },
+    getList() {
+      this.removeData()
+      this.init()
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById('monitorChart'))
+      const that = this
+      that.chart.on('click', function(params) {
+        that.$emit('equipmentName', params.name)
+      })
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          axisLabel: {
+            interval: 0,
+            rotate: -30
+          },
+          max: 10,
+          data: this.xDataList
+        },
+        yAxis: [{
+          type: 'value',
+          axisLabel: {
+            formatter: '{value}小时'
+          }
+        },
+        {
+          type: 'value',
+          axisLabel: {
+            formatter: '{value}小时'
+          }
+        }
+        ],
+        series: [
+          {
+            name: '稼动率值',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            barWidth: 40,
+            data: this.yDataList
+          },
+          {
+            name: '稼动率值',
+            type: 'line',
+            yAxisIndex: 1,
+            data: this.yDataList
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/EquipmentManager/equipmentUtilizationRate/components/mttrDetail-chart.vue

@@ -0,0 +1,165 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-13 16:39:34
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:43:34
+ * @Description: MTTR详情堆积图
+-->
+<template>
+  <div>
+    <div>
+      <el-button-group>
+        <el-button @click="byYear">年</el-button>
+        <el-button @click="byQuarterly">季度</el-button>
+        <el-button @click="byMonth">月</el-button>
+        <el-button @click="byWeek">周</el-button>
+        <el-button @click="byDay">天</el-button>
+      </el-button-group>
+    </div>
+    <div id="monitorChart" :style="{width: '700px', height: '550px'}" style="margin-left:10%" />
+    <mttr-table v-if="tableVisible" :time1="startTime" :time2="endTime" :equipment-name="name" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+// import { getMttrDetail } from '@/api/equipment/infoPandect'
+import MttrTable from './MttrTable'
+
+export default {
+  components: { MttrTable },
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    equipmentName: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      tableVisible: false,
+      equipmentDetail: [],
+      list: [],
+      xDataList: [],
+      yDataList: [],
+      startTime: '',
+      endTime: '',
+      name: ''
+    }
+  },
+  mounted() {
+    this.startTime = this.time1
+    this.endTime = this.time2
+    this.name = this.equipmentName
+    this.removeData()
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    getDataList(params) {
+      console.log(params)
+    },
+    byYear() {
+      this.removeData()
+      this.setChart(this.list.年)
+    },
+    byQuarterly() {
+      this.removeData()
+      this.setChart(this.list.季度)
+    },
+    byMonth() {
+      this.removeData()
+      this.setChart(this.list.月)
+    },
+    byWeek() {
+      this.removeData()
+      this.setChart(this.list.周)
+    },
+    byDay() {
+      this.removeData()
+      this.setChart(this.list.天)
+    },
+    setChart(list) {
+      this.init()
+    },
+    removeData() {
+      this.xDataList = [this.name]
+      this.yDataList = [30, 40, 30, 33, 44]
+    },
+    getList() {
+      this.tableVisible = true
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById('monitorChart'))
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          max: 10,
+          axisLabel: {
+            interval: 0,
+            rotate: -30
+          },
+          data: this.xDataList
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: '稼动率值',
+            type: 'line',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.yDataList
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/EquipmentManager/equipmentUtilizationRate/components/oee-chart.vue

@@ -0,0 +1,137 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-13 16:39:34
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:34:30
+ * @Description: OEE折线柱状图
+-->
+<template>
+  <div>
+    <div id="monitorChart" :style="{width: '1000px', height: '800px'}" style="margin-left:10%" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+// import { getOEE } from '@/api/equipment/infoPandect'
+
+export default {
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      list: [],
+      xDataList: [],
+      oeeList: []
+    }
+  },
+  mounted() {},
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    removeData() {
+      this.xDataList = ['ACOT1', 'ACOT2', 'ACOT-a', 'ACOT-b']
+      this.oeeList = [20, 30, 80, 44]
+    },
+    getList() {
+      this.removeData()
+      this.init()
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById('monitorChart'))
+      const that = this
+      that.chart.on('click', function(params) {
+        that.$emit('equipmentName', params.name)
+      })
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          axisLabel: {
+            interval: 0,
+            rotate: -30
+          },
+          max: 10,
+          data: this.xDataList
+        },
+        yAxis: [{
+          type: 'value',
+          min: 0,
+          max: 100,
+          axisLabel: {
+            formatter: '{value}%'
+          }
+        },
+        {
+          type: 'value',
+          min: 0,
+          max: 100,
+          axisLabel: {
+            formatter: '{value}%'
+          }
+        }
+        ],
+        series: [
+          {
+            name: 'oee',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            barWidth: 40,
+            data: this.oeeList
+          },
+          {
+            name: 'oee',
+            type: 'line',
+            yAxisIndex: 1,
+            data: this.oeeList
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/EquipmentManager/equipmentUtilizationRate/components/oeeDetail-chart.vue

@@ -0,0 +1,258 @@
+<!--
+ * @Author: DY
+ * @Date: 2021-12-13 16:39:34
+ * @LastEditors: DY
+ * @LastEditTime: 2022-03-03 16:37:49
+ * @Description:OEE详情堆积图
+-->
+<template>
+  <div>
+    <div>
+      <el-button-group>
+        <el-button @click="byYear">年</el-button>
+        <el-button @click="byQuarterly">季度</el-button>
+        <el-button @click="byMonth">月</el-button>
+        <el-button @click="byWeek">周</el-button>
+        <el-button @click="byDay">天</el-button>
+      </el-button-group>
+    </div>
+    <div id="monitorChart" :style="{width: '700px', height: '550px'}" style="margin-left:10%" />
+    <oee-table v-if="tableVisible" ref="tableRef" :table-data="tableData" :equipment-name="name" />
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+// import { getOEEDetail } from '@/api/equipment/infoPandect'
+import OeeTable from './OeeTable'
+
+export default {
+  components: { OeeTable },
+  props: {
+    time1: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    time2: {
+      type: Date,
+      default: () => {
+        return ''
+      }
+    },
+    equipmentName: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      tableVisible: false,
+      equipmentDetail: [],
+      tableData: [],
+      list: [],
+      xDataList: [],
+      oeeList: [],
+      startTime: '',
+      endTime: '',
+      name: ''
+    }
+  },
+  mounted() {
+    this.startTime = this.time1
+    this.endTime = this.time2
+    this.name = this.equipmentName
+    this.removeData()
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    getDataList(params) {
+      console.log(params)
+    },
+    async byYear() {
+      this.removeData()
+      this.setChart(this.list.年)
+      this.tableData = this.list.年
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    byQuarterly() {
+      this.removeData()
+      this.setChart(this.list.季度)
+      this.tableData = this.list.季度
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    byMonth() {
+      this.removeData()
+      this.setChart(this.list.月)
+      this.tableData = this.list.月
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    byWeek() {
+      this.removeData()
+      this.setChart(this.list.周)
+      this.tableData = this.list.周
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    byDay() {
+      this.removeData()
+      this.setChart(this.list.天)
+      this.tableData = this.list.天
+      setTimeout(() => {
+        this.$refs.tableRef.init()
+      }, 60)
+    },
+    setChart(list) {
+      this.init()
+    },
+    removeData() {
+      this.xDataList = [this.name]
+      this.oeeList = [30, 40, 30, 33, 44]
+    },
+    getList() {
+      this.tableVisible = true
+    },
+    init() {
+      this.chart = echarts.init(document.getElementById('monitorChart'))
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          max: 10,
+          axisLabel: {
+            interval: 0,
+            rotate: -30
+          },
+          data: this.xDataList
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: 'oee',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.oeeList
+          },
+          {
+            name: 'performanceRate',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.performanceRateList
+          },
+          {
+            name: 'productiveCount',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.productiveCountList
+          },
+          {
+            name: 'productiveTime',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.productiveTimeList
+          },
+          {
+            name: 'runTime',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.runTimeList
+          },
+          {
+            name: 'time',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.timeList
+          },
+          {
+            name: 'timeRate',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: this.timeRateList
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/QualityManager/QCPplan.vue

@@ -0,0 +1,178 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 15:41:11
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 09:22:58
+ * @Description:
+-->
+<template>
+  <div class="app-container">
+    <el-form
+      ref="formData"
+      :rules="rules"
+      :model="listQuery"
+      :inline="true"
+      size="medium"
+      label-width="100px"
+    >
+      <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
+        <el-date-picker
+          v-model="listQuery.timeSlot"
+          type="daterange"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          :start-placeholder="$t('module.orderManage.order.StartTime')"
+          :end-placeholder="$t('module.orderManage.order.StartTime')"
+          :range-separator="$t('module.orderManage.order.To')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
+      </el-form-item>
+    </el-form>
+    <base-table
+      :page="listQuery.current"
+      :limit="listQuery.size"
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    >
+      <method-btn
+        slot="handleBtn"
+        :width="trueWidth"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="listQuery.current"
+      :limit.sync="listQuery.size"
+      @pagination="getList()"
+    />
+    <Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
+  </div>
+</template>
+
+<script>
+import FactoryAdd from './components/ExecutionInfoDetail.vue'
+import BaseTable from '@/components/BaseTable'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
+import { timeFormatter } from '@/filters'
+import i18n from '@/lang'
+/**
+ * 表格表头配置项 TypeScript接口注释
+ * tableConfig<ConfigItem> = []
+ *
+ * Interface ConfigItem = {
+ *  prop: string,
+ *  label: string,
+ *  width: string,
+ *  align: string,
+ *  subcomponent: function,
+ *  filter: function
+ * }
+ *
+ *
+ */
+
+const tableBtn = [
+  {
+    type: 'see',
+    btnName: 'btn.see'
+  }
+]
+const tableProps = [
+  {
+    prop: 'name',
+    label: i18n.t('module.quality.QCPplan.QCPcode'),
+    align: 'center'
+  },
+  {
+    prop: 'createTime',
+    label: i18n.t('module.quality.QCPplan.getTime'),
+    filter: timeFormatter,
+    align: 'center'
+  }
+]
+
+export default {
+  name: 'ExecutionInfo',
+  components: { Pagination, BaseTable, MethodBtn, FactoryAdd },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
+  data() {
+    return {
+      addOrUpdateVisible: false,
+      tableBtn,
+      trueWidth: 200,
+      tableProps,
+      list: [],
+      total: 0,
+      listLoading: true,
+      rules: {},
+      listQuery: {
+        current: 1,
+        size: 10,
+        timeSlot: []
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    handleClick(raw) {
+      this.addNew(raw.data.id)
+    },
+    getList() {
+      // this.listLoading = true
+      if (this.listQuery.timeSlot) {
+        this.listQuery.startTime = this.listQuery.timeSlot[0]
+        this.listQuery.endTime = this.listQuery.timeSlot[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      // ExecutionInfoList(this.listQuery).then(response => {
+      //   if (response.data.records) {
+      //     this.list = response.data.records
+      //   } else {
+      //     this.list.splice(0, this.list.length)
+      //   }
+      //   this.total = response.data.total
+      this.listLoading = false
+      // })
+    },
+    // 新增 / 修改
+    addNew(id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>

src/views/QualityManager/components/ExecutionInfoDetail.vue

@@ -0,0 +1,115 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 16:37:56
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-01-17 15:21:50
+ * @Description:
+-->
+<template>
+  <el-dialog
+    :title="'btn.see' | i18nFilter"
+    :visible.sync="visible"
+  >
+    <el-row :gutter="10">
+      <el-form
+        ref="dataForm"
+        :model="dataForm"
+        size="medium"
+        label-width="110px"
+        label-position="left"
+      >
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
+                <el-input v-model="dataForm.name" :placeholder="$t('module.basicData.Warehouse.OrderName')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
+                <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
+                <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
+                <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
+                <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
+                <el-input v-model="dataForm.craftName" :placeholder="$t('module.basicData.Warehouse.TotalProcessName')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
+                <el-input
+                  v-model="dataForm.subProccessName"
+                  :placeholder="$t('module.basicData.Warehouse.SubProcessName')"
+                  readonly
+                  :style="{width: '100%'}"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { ExecutionInfoDetail } from '@/api/orderManage/00A'
+
+export default {
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        id: 0,
+        name: undefined,
+        createTime: undefined,
+        taskCode: undefined,
+        taskType: undefined,
+        craftName: undefined,
+        planQuantity: undefined,
+        subProccessName: undefined
+      }
+    }
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || ''
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          ExecutionInfoDetail(this.dataForm.id).then(res => {
+            this.dataForm = res.data
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/QualityManager/scrap/ScrapInfo-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-20 11:03:09
+ * @LastEditTime: 2022-03-16 14:11:09
  * @Description:
 -->
 <template>
@@ -66,10 +66,10 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderId')" prop="workOrderId">
+        <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="workOrderId">
           <el-select
             v-model="dataForm.workOrderId"
-            :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderId')])"
+            :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])"
             clearable
             :style="{width: '100%'}"
           >
@@ -91,7 +91,7 @@
         </el-form-item>
 
         <el-form-item :label="$t('module.basicData.ScrapInfo.name')" prop="equipmentId">
-          <el-select v-model="dataForm.equipmentId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.name')])" clearable :style="{width: '100%'}" @change="getScrapGrade">
+          <el-select v-model="dataForm.equipmentId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.name')])" clearable :style="{width: '100%'}">
             <el-option
               v-for="(item, index) in device"
               :key="index"
@@ -101,10 +101,6 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item v-if="tag" :label="$t('module.basicData.ScrapInfo.wasteGrade')" prop="ewasteGrade">
-          <el-input v-model="wasteGrade" clear readonly :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.wasteGrade')])" :disabled="true" />
-        </el-form-item>
-
         <el-form-item :label="$t('module.basicData.ScrapInfo.cause')" prop="scrapReasonId">
           <!-- <el-input v-model="dataForm.registerPerson" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.RegisterPerson')])" clearable :style="{width: '100%'}" /> -->
           <el-select
@@ -122,6 +118,9 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item :label="$t('module.basicData.ScrapInfo.registrationPlace')" prop="placeOfRegis">
+          <el-input v-model="dataForm.placeOfRegis" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.registrationPlace')])" clearable :style="{width: '100%'}" />
+        </el-form-item>
         <el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
           <el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.remark')])" clearable :style="{width: '100%'}" />
         </el-form-item>
@@ -136,12 +135,13 @@
 </template>
 
 <script>
+import moment from 'moment'
 import i18n from '@/lang'
-import { getScrapInfo, editScrapInfo, addScrapInfo, getScrap } from '@/api/quality-manage/scrap'
+import { getScrapInfo, editScrapInfo, addScrapInfo } from '@/api/quality-manage/scrap'
 import { scrapReasonList } from '@/api/dict'
 import { getDictWorker } from '@/api/dict'
 import { getEqList } from '@/api/equipment/maintain'
-import { workOrderList } from '@/api/orderManage/workOrder/workOrder'
+import { workOrderListList } from '@/api/orderManage/workOrder/workOrder'
 
 const wasteGradeArr = [{
   value: '加工可用',
@@ -165,6 +165,7 @@ export default {
   data() {
     return {
       visible: false,
+      moment,
       dataForm: {
         id: 0,
         source: undefined,
@@ -173,24 +174,15 @@ export default {
         scrapGrade: undefined,
         description: undefined,
         substrateId: undefined,
+        placeOfRegis: '00A',
         remark: undefined
       },
       wasteGradeArr,
       entryType,
       rules: {
-        name: [{
-          required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.WasteName')]),
-          trigger: 'blur'
-        }],
-        code: [{
-          required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.WasteCode')]),
-          trigger: 'blur'
-        }],
         equipmentId: [{
           required: true,
-          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.equipmentId')]),
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.name')]),
           trigger: 'change'
         }],
         substrateId: [{
@@ -202,6 +194,11 @@ export default {
           required: true,
           message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.registerPerson')]),
           trigger: 'change'
+        }],
+        scrapReasonId: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.cause')]),
+          trigger: 'change'
         }]
       },
       dict: {
@@ -210,7 +207,6 @@ export default {
         orderList: []
       },
       device: [],
-      wasteGrade: '',
       tag: false
     }
   },
@@ -218,19 +214,6 @@ export default {
     this.getDict()
   },
   methods: {
-    getScrapGrade(val) {
-      getScrap(val).then(res => {
-        if (res.code === 0) {
-          if (res.data) {
-            this.tag = true
-            this.wasteGrade = res.data.dataName
-          } else {
-            this.tag = false
-            this.wasteGrade = ''
-          }
-        }
-      })
-    },
     onClose() {
       this.$refs['dataForm'].resetFields()
     },
@@ -242,6 +225,8 @@ export default {
           getScrapInfo({ id: this.dataForm.id }).then(res => {
             this.dataForm = res.data
           })
+        } else {
+          this.dataForm.registerTime = this.moment()
         }
       })
     },
@@ -279,7 +264,7 @@ export default {
       })
     },
     async getDict() {
-      const result3 = await workOrderList({
+      const result3 = await workOrderListList({
         current: 1,
         size: 999
       })

src/views/QualityManager/scrap/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-26 13:39:35
+ * @LastEditTime: 2022-03-16 09:54:40
  * @Description:
 -->
 <template>
@@ -11,10 +11,9 @@
       :model="formData"
       :inline="true"
       size="medium"
-      label-width="130px"
     >
-      <el-form-item v-if="false" :label="$t('module.basicData.ScrapInfo.PlateId')" prop="basalId">
+      <el-form-item :label="$t('module.basicData.ScrapInfo.PlateId')" prop="substrateId">
-        <el-input v-model="formData.basalId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
+        <el-input v-model="formData.substrateId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
       </el-form-item>
       <el-form-item :label="$t('module.basicData.ScrapInfo.TimePeriod')" prop="time">
         <el-date-picker
@@ -38,6 +37,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="orderId">
+        <el-select v-model="formData.orderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
+          <el-option
+            v-for="(item, index) in orderList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
         <el-button type="primary" @click="addNew()"> {{ 'btn.add' | i18nFilter }} </el-button>
@@ -79,6 +88,7 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
 import { getEqList } from '@/api/equipment/maintain'
+import { ExecutionInfoList } from '@/api/orderManage/00A'
 // import DictFilter from '@/components/BaseTable/subcomponents/DataDictFilter'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -113,13 +123,13 @@ const tableProps = [
   //   filter: timeFormatter
   // },
   {
-    prop: 'source',
+    prop: 'substrateId',
-    label: i18n.t('module.basicData.ScrapInfo.source'),
+    label: i18n.t('module.basicData.ScrapInfo.PlateId'),
     align: 'center'
   },
   {
-    prop: 'scrapGradeDic',
+    prop: 'workOrderName',
-    label: i18n.t('module.basicData.ScrapInfo.wasteGrade'),
+    label: i18n.t('module.basicData.ScrapInfo.workOrderName'),
     align: 'center'
   },
   {
@@ -127,11 +137,6 @@ const tableProps = [
     label: i18n.t('module.basicData.ScrapInfo.name'),
     align: 'center'
   },
-  {
-    prop: 'substrateId',
-    label: i18n.t('module.basicData.ScrapInfo.PlateId'),
-    align: 'center'
-  },
   {
     prop: 'registerPersonName',
     label: i18n.t('module.basicData.ScrapInfo.RegisterPerson'),
@@ -143,6 +148,11 @@ const tableProps = [
     filter: timeFormatter,
     align: 'center'
   },
+  {
+    prop: 'placeOfRegis',
+    label: i18n.t('module.basicData.ScrapInfo.registrationPlace'),
+    align: 'center'
+  },
   {
     prop: 'scrapReason',
     label: i18n.t('module.basicData.ScrapInfo.cause'),
@@ -171,7 +181,9 @@ export default {
       listLoading: true,
       formData: {
         timeSlot: null,
-        basalId: '',
+        substrateId: '',
+        orderId: '',
+        equipmentId: '',
         current: 1,
         size: 10,
         id: ''
@@ -183,6 +195,7 @@ export default {
       dict: {
         scrap: []
       },
+      orderList: [],
       device: []
     }
   },
@@ -241,6 +254,13 @@ export default {
       if (result1.code === 0) {
         this.device = result1.data.records
       }
+      const result2 = await ExecutionInfoList({
+        current: 1,
+        size: 999
+      })
+      if (result2.code === 0) {
+        this.orderList = result2.data.records
+      }
       const result = await scrapReasonList()
       this.dict.scrap = result
     },

src/views/UserPage/usermanage.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-04-06 19:33:11
  * @LastEditors: zwq
- * @LastEditTime: 2021-07-09 09:42:54
+ * @LastEditTime: 2022-03-10 16:54:48
  * @Description:
 -->
 <template>
@@ -257,7 +257,7 @@ export default {
       if (res.code === 0) {
         this.list = res.data.records
         this.list.forEach(item => {
-          item.roleName = item.stringList.toString()
+          item.roleName = item.stringList?.toString()
         })
         this.total = res.data.total
         this.listLoading = false

src/views/art/components/Process-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: Please set LastEditors
+ * @LastEditors: zwq
- * @LastEditTime: 2021-07-26 14:39:36
+ * @LastEditTime: 2022-03-16 14:30:59
  * @Description:
 -->
 <template>
@@ -15,16 +15,16 @@
         <el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])" clearable />
       </el-form-item>
       <el-form-item :label="$t('module.art.processList.processEq')" prop="equipmentIds">
-        <el-select v-model="dataForm.equipmentIds" clearable filterable multiple>
+        <el-select v-model="dataForm.equipmentIds" clearable filterable multiple @change="$forceUpdate()">
           <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('module.art.processList.type')" prop="type">
+      <!-- <el-form-item :label="$t('module.art.processList.type')" prop="type">
         <el-select v-model="dataForm.type" clearable filterable>
           <el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
-      <el-form-item :label="$t('module.art.processList.description')" prop="address">
+      <el-form-item :label="$t('module.art.processList.description')" prop="description">
         <el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.description')])" clearable />
       </el-form-item>
     </el-form>
@@ -88,10 +88,7 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           getInfo({ id: this.dataForm.id }).then(res => {
-            this.dataForm.id = res.data.id
+            this.dataForm = res.data
-            this.dataForm.name = res.data.name
-            this.dataForm.type = res.data.type
-            this.dataForm.description = res.data.description
             this.dataForm.equipmentIds = res.data.equipments.map(item => {
               return item.id
             })
@@ -101,7 +98,6 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
-      console.log(!this.dataForm.id)
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           const data = {

src/views/art/components/add-dialog.vue

@@ -32,7 +32,7 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item v-if="false" :label="$t('module.art.artBOM')" prop="bomId">
+      <!-- <el-form-item v-if="false" :label="$t('module.art.artBOM')" prop="bomId">
         <el-select
           v-model="obj.bomId"
           :class="$style.select"
@@ -47,7 +47,7 @@
             :value="item.id"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('module.art.description')" prop="description">
         <el-input v-model="obj.description" />
       </el-form-item>
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import { add, update, getInfo, listSubstrate, listBom, getCode } from '@/api/art-manage/art.js'
+import { add, update, getInfo, getCode } from '@/api/art-manage/art.js'
 import SubmitBar from '@/views/art/components/submit-bar'
 
 export default {
@@ -91,8 +91,6 @@ export default {
         substrateId: '',
         bomId: ''
       },
-      substrateList: [],
-      bomList: [],
       rules: {
         name: [
           { required: true, message: this.$t('module.art.artName') + this.$t('module.art.notNull'), trigger: 'blur' },
@@ -129,14 +127,6 @@ export default {
   },
   methods: {
     init: async function() {
-      if (this.substrateList.length === 0) {
-        const substrateRes = await listSubstrate()
-        this.substrateList = substrateRes.data
-      }
-      if (this.bomList.length === 0) {
-        const bomRes = await listBom()
-        this.bomList = bomRes.data
-      }
       if (this.id) {
         const res = await getInfo({ id: this.id })
         this.obj = res.data

src/views/art/process/process-chart.vue

@@ -13,11 +13,11 @@
               {{ i.equipmentId ? equipmentObj[i.equipmentId] : $t('module.art.eqName') }}
             </el-button>
           </el-col>
-          <el-col :span="4" class="process-table-main-item-item">
+          <!-- <el-col :span="4" class="process-table-main-item-item">
             <el-button v-if="!processPortObj[item.workSequenceId]" disabled>
               {{ i.equipmentRecipeId ? equipmentRecipeObj[i.equipmentRecipeId] : $t('module.art.recipeName') }}
             </el-button>
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="4" class="process-table-main-item-item">
             <el-button v-if="!processPortObj[item.workSequenceId]" disabled>
               {{ i.nodeType ? nodeTypesObj[i.nodeType] : $t('module.art.artType') }}
@@ -36,7 +36,7 @@
 </template>
 <script>
 import {
-  listAllEquipmentRecipe,
+  // listAllEquipmentRecipe,
   listProcessFlowNode,
   listProcess
 } from '@/api/art-manage/art.js'
@@ -57,7 +57,7 @@ export default {
       processObj: {},
       processPortObj: {},
       equipmentRecipeList: [],
-      equipmentRecipeObj: [],
+      // equipmentRecipeObj: [],
       equipmentList: [],
       equipmentObj: {},
       showAddList: [],
@@ -102,12 +102,12 @@ export default {
       console.log(this.processList)
       console.log(this.processObj)
       // 获取配方列表
-      const allRecipeRes = await listAllEquipmentRecipe()
+      // const allRecipeRes = await listAllEquipmentRecipe()
-      this.equipmentRecipeList = allRecipeRes.data
+      // this.equipmentRecipeList = allRecipeRes.data
-      allRecipeRes.data.map(item => {
+      // allRecipeRes.data.map(item => {
-        this.equipmentRecipeObj[item.id] = item.name
+      //   this.equipmentRecipeObj[item.id] = item.name
-      })
+      // })
-      console.log(this.equipmentRecipeList)
+      // console.log(this.equipmentRecipeList)
       // 获取设备列表
       const allEquipmentRes = await listEquipment()
       this.equipmentList = allEquipmentRes.data

src/views/art/process/process-table.vue

@@ -19,11 +19,11 @@
                 {{ i.equipmentId ? equipmentObj[i.equipmentId] : $t('module.art.eqName') }}
               </el-button>
             </el-col>
-            <el-col :span="4" class="process-table-main-item-item">
+            <!-- <el-col :span="4" class="process-table-main-item-item">
               <el-button v-if="!processPortObj[item.workSequenceId]" icon="el-icon-edit" @click="choiceRecipe(index, idx, i.equipmentRecipeId)">
                 {{ i.equipmentRecipeId ? equipmentRecipeObj[i.equipmentRecipeId] : $t('module.art.recipeName') }}
               </el-button>
-            </el-col>
+            </el-col> -->
             <!-- <el-col :span="4" class="process-table-main-item-item">
               <el-button v-if="!processPortObj[item.workSequenceId]" icon="el-icon-edit" @click="choiceArtType(index, idx, i.nodeType)">
                 {{ i.nodeType ? nodeTypesObj[i.nodeType] : $t('module.art.artType') }}
@@ -55,7 +55,7 @@ import processTableSelect from './process-table-select.vue'
 import processTableAdd from './process-table-add.vue'
 import vuedraggable from 'vuedraggable'
 import {
-  listAllEquipmentRecipe,
+  // listAllEquipmentRecipe,
   addProcessFlows,
   listProcessFlowNode,
   listProcess
@@ -82,7 +82,7 @@ export default {
       processObj: {},
       processPortObj: {},
       equipmentRecipeList: [],
-      equipmentRecipeObj: [],
+      // equipmentRecipeObj: [],
       equipmentList: [],
       equipmentObj: {},
       showAddList: [],
@@ -131,12 +131,12 @@ export default {
       console.log(this.processList)
       console.log(this.processObj)
       // 获取配方列表
-      const allRecipeRes = await listAllEquipmentRecipe()
+      // const allRecipeRes = await listAllEquipmentRecipe()
-      this.equipmentRecipeList = allRecipeRes.data
+      // this.equipmentRecipeList = allRecipeRes.data
-      allRecipeRes.data.map(item => {
+      // allRecipeRes.data.map(item => {
-        this.equipmentRecipeObj[item.id] = item.name
+      //   this.equipmentRecipeObj[item.id] = item.name
-      })
+      // })
-      console.log(this.equipmentRecipeList)
+      // console.log(this.equipmentRecipeList)
       // 获取设备列表
       const allEquipmentRes = await listEquipment()
       this.equipmentList = allEquipmentRes.data
@@ -197,8 +197,8 @@ export default {
         nodeType: '',
         processFlowId: this.processFlowId,
         workSequenceId: this.dataList[index].workSequenceId,
-        description: this.dataList[index].processFlowEquipmentParams[0]?.description ? this.dataList[index].processFlowEquipmentParams[0].description : '',
+        description: this.dataList[index].processFlowEquipmentParams[0].description ? this.dataList[index].processFlowEquipmentParams[0].description : '',
-        remark: this.dataList[index].processFlowEquipmentParams[0]?.remark ? this.dataList[index].processFlowEquipmentParams[0].remark : ''
+        remark: this.dataList[index].processFlowEquipmentParams[0].remark ? this.dataList[index].processFlowEquipmentParams[0].remark : ''
       })
       e.stopPropagation()
     },
@@ -232,16 +232,16 @@ export default {
       this.$refs.processtableselect.init('equipmentId', first, sec, id, this.processObj[processId].equipments)
     },
     // 选择配方
-    choiceRecipe(first, sec, id) {
+    // choiceRecipe(first, sec, id) {
-      if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
+    //   if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
-        this.$refs.processtableselect.init('equipmentRecipeId', first, sec, id, this.equipmentRecipeList.filter(f => f.equipmentId === this.dataList[first].processFlowEquipmentParams[sec].equipmentId))
+    //     this.$refs.processtableselect.init('equipmentRecipeId', first, sec, id, this.equipmentRecipeList.filter(f => f.equipmentId === this.dataList[first].processFlowEquipmentParams[sec].equipmentId))
-      } else {
+    //   } else {
-        this.$message.error(this.$t('module.art.choiceEqError'))
+    //     this.$message.error(this.$t('module.art.choiceEqError'))
-      }
+    //   }
-    },
+    // },
     // 选择工艺类型
     choiceArtType(first, sec, id) {
-      if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
+      if (this.dataList[first].processFlowEquipmentParams[sec].equipmentId) {
         this.$refs.processtableselect.init('nodeType', first, sec, id, this.nodeTypes)
       } else {
         this.$message.error(this.$t('module.art.choiceEqError'))
@@ -307,13 +307,14 @@ export default {
               hasNull = true
             }
           })
-        } else {
-          item.processFlowEquipmentParams.map(i => {
-            if (!i.equipmentId || !i.equipmentRecipeId) {
-              hasNull = true
-            }
-          })
         }
+        // else {
+        //   item.processFlowEquipmentParams.map(i => {
+        //     if (!i.equipmentId || !i.equipmentRecipeId) {
+        //       hasNull = true
+        //     }
+        //   })
+        // }
       })
       // console.log(JSON.stringify(vm.dataList))
       // if (vm.dataList.length === 0) {

src/views/art/processList.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: gtz
  * @Date: 2021-04-06 20:07:22
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2021-06-23 16:22:06
+ * @LastEditTime: 2022-03-09 16:19:15
  * @Description: file content
 -->
 <template>
@@ -23,7 +23,7 @@
 
 <script>
 // edit here
-import DataDict from './filters'
+// import DataDict from './filters'
 const tableBtn = [{
   type: 'edit',
   btnName: 'btn.edit'
@@ -35,12 +35,14 @@ const tableProps = [{
   prop: 'name',
   label: i18n.t('module.art.processList.processName'),
   align: 'center'
-}, {
+},
-  prop: 'type',
+// {
-  label: i18n.t('module.art.processList.type'),
+//   prop: 'type',
-  align: 'center',
+//   label: i18n.t('module.art.processList.type'),
-  filter: DataDict('typeFilter')
+//   align: 'center',
-}, {
+//   filter: DataDict('typeFilter')
+// },
+{
   prop: 'description',
   label: i18n.t('module.art.processList.description'),
   align: 'center'
@@ -48,7 +50,7 @@ const tableProps = [{
 import BaseTable from '@/components/BaseTable'
 // edit here
 import { list, del } from '@/api/art-manage/process'
-import { equipmentInfoList } from '@/api/basicData/Equipment/equipmentInfo'
+import { equipmentlistList } from '@/api/basicData/Equipment/equipmentInfo'
 import HeadForm from '@/components/basicData/HeadForm'
 import ProcessAdd from './components/Process-add'
 import Pagination from '@/components/Pagination'
@@ -124,12 +126,9 @@ export default {
     },
     async getEqList(key) {
       // edit here
-      const res = await equipmentInfoList({
+      const res = await equipmentlistList()
-        current: 1,
-        size: 999
-      })
       if (res.code === 0) {
-        this.eqList = res.data.records
+        this.eqList = res.data
       }
       this.getList()
     },