Merge pull request 'xiugai' (#442) from projects/ry-line-zhp into projects/ry-line-test

Reviewed-on: #442

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-11-07 09:29:23
+ # @LastEditTime: 2024-11-25 14:31:39
  # @LastEditors: zwq
  # @Description:
 ###
@@ -9,16 +9,11 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = MES系统
+VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://172.16.21.222:48082'
+# VUE_APP_BASE_API = 'http://192.168.8.22:48080'
-VUE_APP_BASE_API = 'http://mes2.kszny.picaiba.com'
+VUE_APP_BASE_API = 'http://172.16.32.79:48082'
-
-
-
-# 积木报表指向地址
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
@@ -26,9 +21,11 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 
 # 百度统计
 # VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
-

.env.front

@@ -1,4 +1,3 @@
-
 # 开发环境配置
 ENV = 'development'
 
@@ -14,6 +13,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.prod

@@ -1,28 +1,23 @@
 ###
- # @Author: zhp
+ # @Author: zwq
- # @Date: 2023-11-07 19:11:40
+ # @Date: 2024-03-27 15:49:55
- # @LastEditTime: 2024-10-17 09:09:05
  # @LastEditors: zwq
+ # @LastEditTime: 2024-10-30 11:08:47
  # @Description:
 ###
 # 生产环境配置
 ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = MES系统
+VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/生产环境
 # VUE_APP_BASE_API = '/prod-api'
 VUE_APP_BASE_API = ''
 
-# 积木报表指向地址
-# VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
-VUE_APP_JIMU_API = ''
-
-
 # 根据服务器或域名修改
 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
-# PUBLIC_PATH = 'http://192.168.0.33:8889/'
+# PUBLIC_PATH = 'http://192.168.0.33:8888/'
 PUBLIC_PATH = ''
 
 # 二级部署路径
@@ -31,6 +26,9 @@ VUE_APP_APP_NAME ='yudao-admin'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.production

@@ -1,12 +0,0 @@
-###
- # @Author: zhp
- # @Date: 2023-10-30 14:18:30
- # @LastEditTime: 2023-11-02 16:16:09
- # @LastEditors: zhp
- # @Description:
-###
-# just a flag
-ENV = 'production'
-
-# base api
-# VUE_APP_BASE_API = '/api'

.env.stage

@@ -15,9 +15,11 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 
 # 百度统计
 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
-

.env.static

@@ -17,6 +17,9 @@ VUE_APP_APP_NAME ='/admin-ui-vue2/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

package.json

@@ -6,9 +6,9 @@
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
-    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
     "front": "vue-cli-service serve --mode front",
-    "build:prod": "vue-cli-service build --mode prod",
+    "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",
     "build:dev": "vue-cli-service build --mode dev",
     "build:static": "vue-cli-service build --mode static",
@@ -41,19 +41,17 @@
     "url": "https://github.com/YunaiV/ruoyi-vue-pro"
   },
   "dependencies": {
-    "@antv/x6": "^2.15.3",
     "@babel/parser": "7.18.4",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.27.2",
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "0.10.0",
     "clipboard": "2.0.8",
-    "code-brick-zj": "^1.0.5",
+    "code-brick-zj": "^1.0.2",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "diagram-js": "^12.3.0",
     "echarts": "5.4.0",
-    "el-tree-transfer": "^2.4.7",
     "element-ui": "2.15.12",
     "file-saver": "^2.0.5",
     "fuse.js": "6.6.2",
@@ -72,7 +70,6 @@
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "throttle-debounce": "2.1.0",
-    "uuid": "^9.0.1",
     "video.js": "^8.5.2",
     "vue": "2.7.14",
     "vue-count-to": "1.0.13",

src/api/analysis/energyAnalysis.js

@@ -1,10 +1,3 @@
-/*
- * @Author: zwq
- * @Date: 2024-06-28 17:03:29
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-27 09:24:09
- * @Description:
- */
 import request from '@/utils/request'
 
 // 获取走势分析数据
@@ -15,24 +8,7 @@ export function getEnergyTrend(data) {
     data: data
   })
 }
-// 导出走势分析数据
+
-export function exportTrend(data) {
-  return request({
-    url: '/analysis/energy-analysis/exportTrend',
-    method: 'post',
-    data: data,
-    responseType: 'blob'
-  })
-}
-// 导出对比分析数据
-export function exportCompare(data) {
-  return request({
-    url: '/analysis/energy-analysis/exportCompare',
-    method: 'post',
-    data: data,
-    responseType: 'blob'
-  })
-}
 // 获取对比分析数据
 export function getCompare(data) {
   return request({
@@ -51,24 +27,6 @@ export function getYoy(data) {
   })
 }
 
-// 导出同比分析数据
-export function exportYoy(data) {
-  return request({
-    url: '/analysis/energy-analysis/exportYoy',
-    method: 'post',
-    data: data,
-    responseType: 'blob'
-  })
-}
-// 导出环比分析数据
-export function exportChain(data) {
-  return request({
-    url: '/analysis/energy-analysis/exportChain',
-    method: 'post',
-    data: data,
-    responseType: 'blob'
-  })
-}
 // 获取环比分析数据(1:月,2:周,3:日)
 export function getQoq(data) {
   return request({
@@ -76,4 +34,4 @@ export function getQoq(data) {
     method: 'post',
     data: data
   })
-}
+}

src/api/base/coreAlarmLog.js

@@ -1,60 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-03 15:25:55
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建异常警告
-export function createcoreAlarmLog(data) {
-  return request({
-    url: '/base/core-alarm-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新异常警告
-export function updatecoreAlarmLog(data) {
-  return request({
-    url: '/base/core-alarm-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除异常警告
-export function deletecoreAlarmLog(id) {
-  return request({
-    url: '/base/core-alarm-log/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得异常警告
-export function getcoreAlarmLog(id) {
-  return request({
-    url: '/base/core-alarm-log/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得警告分页
-export function getcoreAlarmLogPage(query) {
-  return request({
-    url: '/base/core-alarm-log/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getcoreAlarmLogList(query) {
-  return request({
-    url: '/base/core-alarm-log/list',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreCustomer.js

@@ -1,68 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-02 20:25:36
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建客户
-export function createCustomer(data) {
-  return request({
-    url: '/base/core-customer/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新客户
-export function updateCustomer(data) {
-  return request({
-    url: '/base/core-customer/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除客户
-export function deleteCustomer(id) {
-  return request({
-    url: '/base/core-customer/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得客户
-export function getCustomer(id) {
-  return request({
-    url: '/base/core-customer/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得客户code
-export function getCode() {
-  return request({
-    url: '/base/core-customer/getCode',
-    method: 'get'
-  })
-}
-
-// 获得客户分页
-export function getCustomerPage(query) {
-  return request({
-    url: '/base/core-customer/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCustomerList(query) {
-  return request({
-    url: '/base/core-customer/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreDepartment.js

@@ -1,75 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-30 14:37:28
- * @LastEditors: DY
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建部门
-export function createCoreDepartment(data) {
-  return request({
-    url: '/base/core-department/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新部门
-export function updateCoreDepartment(data) {
-  return request({
-    url: '/base/core-department/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除部门
-export function deleteCoreDepartment(id) {
-  return request({
-    url: '/base/core-department/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得部门
-export function getCoreDepartment(id) {
-  return request({
-    url: '/base/core-department/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得部门code
-export function getCode() {
-  return request({
-    url: '/base/core-department/getCode',
-    method: 'get'
-  })
-}
-
-// 获得部门分页
-export function getCoreDepartmentPage(query) {
-  return request({
-    url: '/base/core-department/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCoreDepartmentList(query) {
-  return request({
-    url: '/base/core-department/listAll',
-    method: 'get',
-    params: query
-  })
-}
-export function getDepartmentList(query) {
-  return request({
-    url: '/system/dept/list',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreHotMaterial.js

@@ -1,68 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-15 15:56:14
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建原料
-export function createHotMaterial(data) {
-  return request({
-    url: '/base/core-hot-material/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新原料
-export function updateHotMaterial(data) {
-  return request({
-    url: '/base/core-hot-material/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除原料
-export function deleteHotMaterial(id) {
-  return request({
-    url: '/base/core-hot-material/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得原料
-export function getHotMaterial(id) {
-  return request({
-    url: '/base/core-hot-material/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得原料code
-export function getCode() {
-  return request({
-    url: '/base/core-hot-material/getCode',
-    method: 'get'
-  })
-}
-
-// 获得原料分页
-export function getHotMaterialPage(query) {
-  return request({
-    url: '/base/core-hot-material/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getHotMaterialList(query) {
-  return request({
-    url: '/base/core-hot-material/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreMajor.js

@@ -1,68 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-31 15:11:25
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建专业
-export function createCoreMajor(data) {
-  return request({
-    url: '/base/core-major/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新专业
-export function updateCoreMajor(data) {
-  return request({
-    url: '/base/core-major/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除专业
-export function deleteCoreMajor(id) {
-  return request({
-    url: '/base/core-major/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得专业
-export function getCoreMajor(id) {
-  return request({
-    url: '/base/core-major/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得专业code
-export function getCode() {
-  return request({
-    url: '/base/core-major/getCode',
-    method: 'get'
-  })
-}
-
-// 获得专业分页
-export function getCoreMajorPage(query) {
-  return request({
-    url: '/base/core-major/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCoreMajorList(query) {
-  return request({
-    url: '/base/core-major/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreProduct.js

@@ -1,111 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2024-07-08 14:35:17
- * @LastEditors: zwq
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建产品
-export function createCoreProduct(data) {
-  return request({
-    url: '/base/core-product/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新产品
-export function updateCoreProduct(data) {
-  return request({
-    url: '/base/core-product/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除产品
-export function deleteCoreProduct(id) {
-  return request({
-    url: '/base/core-product/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得产品
-export function getCoreProduct(id) {
-  return request({
-    url: '/base/core-product/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得产品code
-export function getCode() {
-  return request({
-    url: '/base/core-product/getCode',
-    method: 'get'
-  })
-}
-
-// 获得产品分页
-export function getCoreProductPage(query) {
-  return request({
-    url: '/base/core-product/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCoreProductList(query) {
-  return request({
-    url: '/base/core-product-material/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建产品属性
-export function createCoreProductAttr(data) {
-  return request({
-    url: '/base/core-product-attr/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新产品属性
-export function updateCoreProductAttr(data) {
-  return request({
-    url: '/base/core-product-attr/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除产品属性
-export function deleteCoreProductAttr(id) {
-  return request({
-    url: '/base/core-product-attr/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得产品属性
-export function getCoreProductAttr(id) {
-  return request({
-    url: '/base/core-product-attr/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得产品属性分页
-export function getCoreProductAttrPage(query) {
-  return request({
-    url: '/base/core-product-attr/page',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreProductionLine.js

@@ -1,68 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-03 19:06:15
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建产线
-export function createCorePL(data) {
-  return request({
-    url: '/base/core-production-line/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新产线
-export function updateCorePL(data) {
-  return request({
-    url: '/base/core-production-line/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除产线
-export function deleteCorePL(id) {
-  return request({
-    url: '/base/core-production-line/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得产线
-export function getCorePL(id) {
-  return request({
-    url: '/base/core-production-line/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得产线code
-export function getCode() {
-  return request({
-    url: '/base/core-production-line/getCode',
-    method: 'get'
-  })
-}
-
-// 获得产线分页
-export function getCorePLPage(query) {
-  return request({
-    url: '/base/core-production-line/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCorePLList(query) {
-  return request({
-    url: '/base/core-production-line/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreSupplier.js

@@ -1,68 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-03 10:39:44
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建供应商
-export function createCoreSupplier(data) {
-  return request({
-    url: '/base/core-supplier/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新供应商
-export function updateCoreSupplier(data) {
-  return request({
-    url: '/base/core-supplier/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除供应商
-export function deleteCoreSupplier(id) {
-  return request({
-    url: '/base/core-supplier/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得供应商
-export function getCoreSupplier(id) {
-  return request({
-    url: '/base/core-supplier/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得供应商code
-export function getCode() {
-  return request({
-    url: '/base/core-supplier/getCode',
-    method: 'get'
-  })
-}
-
-// 获得供应商分页
-export function getCoreSupplierPage(query) {
-  return request({
-    url: '/base/core-supplier/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCoreSupplierList(query) {
-  return request({
-    url: '/base/core-supplier/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreWorkOrder.js

@@ -1,180 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2024-12-27 15:20:14
- * @LastEditors: zwq
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建工单
-export function createCoreWO(data) {
-  return request({
-    url: '/base/core-work-order/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取工艺模式工单预计消耗物料
-export function getMaterialCostWorkOrder(data) {
-  return request({
-    url: '/extend/process-retrospect/getMaterialCostWorkOrder',
-    method: 'post',
-    data: data
-  })
-}
-// 更新工单
-export function updateCoreWO(data) {
-  return request({
-    url: '/base/core-work-order/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除工单
-export function deleteCoreWO(id) {
-  return request({
-    url: '/base/core-work-order/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得工单
-export function getCoreWO(id) {
-  return request({
-    url: '/base/core-work-order/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得工单code
-export function getCode() {
-  return request({
-    url: '/base/core-work-order/getCode',
-    method: 'get'
-  })
-}
-
-// 获得工单分页
-export function getCoreWOPage(query) {
-  return request({
-    url: '/base/core-work-order/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCoreWOList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query
-  })
-}
-
-// 根据工单id获得所有列表
-export function getCoreWOListById(ids) {
-  return request({
-    url: '/base/core-work-order/list?ids='+ ids ,
-    method: 'get'
-  })
-}
-
-// 创建工单预使用原料
-export function createCoreWOMa(data) {
-  return request({
-    url: '/base/core-work-order-material/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新工单预使用原料
-export function updateCoreWOMa(data) {
-  return request({
-    url: '/base/core-work-order-material/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除工单预使用原料
-export function deleteCoreWOMa(id) {
-  return request({
-    url: '/base/core-work-order-material/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得工单预使用原料
-export function getCoreWOMa(id) {
-  return request({
-    url: '/base/core-work-order-material/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得工单预使用原料分页
-export function getCoreWOMaPage(query) {
-  return request({
-    url: '/base/core-work-order-material/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得预计用料信息分页
-export function getMaterialBomPage(query) {
-  return request({
-    url: '/base/material-product-bom/bomUseNum',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得订单分页
-export function getConOrderList(query) {
-  return request({
-    url: '/base/order/listConOrder',
-    method: 'get',
-    params: query
-  })
-}
-
-// 改变工单状态 激活暂停完成作废
-export function statusChange(data) {
-  return request({
-    url: '/base/core-work-order/statusChange',
-    method: 'post',
-    data: data
-  })
-}
-
-// 创建分配产量
-export function createConCoreWOr(data) {
-  return request({
-    url: '/base/core-order-con-work-order/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新分配产量
-export function updateBatch(data) {
-  return request({
-    url: '/base/core-order-con-work-order/updateBatch',
-    method: 'put',
-    data: data
-  })
-}
-// 更新订单表与工单关联表 多对多
-export function updateConCoreWOr(data) {
-  return request({
-    url: '/base/core-order-con-work-order/update',
-    method: 'put',
-    data: data
-  })
-}

src/api/base/coreWorker.js

@@ -1,103 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-02 19:49:52
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建员工
-export function createCoreWorker(data) {
-  return request({
-    url: '/base/core-worker/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新员工
-export function updateCoreWorker(data) {
-  return request({
-    url: '/base/core-worker/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除员工
-export function deleteCoreWorker(id) {
-  return request({
-    url: '/base/core-worker/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得员工
-export function getCoreWorker(id) {
-  return request({
-    url: '/base/core-worker/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得员工code
-export function getCode() {
-  return request({
-    url: '/base/core-worker/getCode',
-    method: 'get'
-  })
-}
-
-// 获得员工分页
-export function getCoreWorkerPage(query) {
-  return request({
-    url: '/base/core-worker/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCoreWorkerList(query) {
-  return request({
-    url: '/base/core-worker/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建员工--专业
-export function createWoBindMa(data) {
-  return request({
-    url: '/base/core-worker-bind-major/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新员工--专业
-export function updateWoBindMa(data) {
-  return request({
-    url: '/base/core-worker-bind-major/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除员工--专业
-export function deleteWoBindMa(id) {
-  return request({
-    url: '/base/core-worker-bind-major/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得员工--专业分页
-export function getWoBindMaPage(query) {
-  return request({
-    url: '/base/core-worker-bind-major/page',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/coreWorkshopSection.js

@@ -1,68 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-03 19:18:00
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建工段
-export function createCWSection(data) {
-  return request({
-    url: '/base/core-workshop-section/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新工段
-export function updateCWSection(data) {
-  return request({
-    url: '/base/core-workshop-section/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除工段
-export function deleteCWSection(id) {
-  return request({
-    url: '/base/core-workshop-section/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得工段
-export function getCWSection(id) {
-  return request({
-    url: '/base/core-workshop-section/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得工段code
-export function getCode() {
-  return request({
-    url: '/base/core-workshop-section/getCode',
-    method: 'get'
-  })
-}
-
-// 获得工段分页
-export function getCWSectionPage(query) {
-  return request({
-    url: '/base/core-workshop-section/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getCWSectionList(query) {
-  return request({
-    url: '/base/core-workshop-section/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/customer.js

@@ -1,8 +0,0 @@
-import request from '@/utils/request'
-// 获得所有客户列表
-export function getCustomerList() {
-  return request({
-    url: '/base/core-customer/listAll',
-    method: 'get'
-  })
-}

src/api/base/delivery.js

@@ -1,100 +0,0 @@
-// 成品发货
-import request from '@/utils/request'
-// 获得成品发货清单分页
-export function deliveryLogPage(data) {
-  return request({
-    url: '/extend/delivery-log/page',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取发货进度分页
-export function deliveryProgressPage(data) {
-  return request({
-    url: '/extend/delivery-progress/page',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取订单列表
-export function listOrderList(query) {
-  return request({
-    url: '/extend/delivery-log/listOrderList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取发货进度分页
-export function deliveryLogDetPage(data) {
-  return request({
-    url: '/extend/delivery-log-det/page',
-    method: 'post',
-    data: data
-  })
-}
-
-// 创建成品发货清单
-export function deliveryLogCreate(data) {
-  return request({
-    url: '/extend/delivery-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新成品发货清单
-export function deliveryLogUpdate(data) {
-  return request({
-    url: '/extend/delivery-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得成品发货清单
-export function getDeliveryLog(query) {
-  return request({
-    url: '/extend/delivery-log/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除成品发货清单
-export function deliveryLogDelete(query) {
-  return request({
-    url: '/extend/delivery-log/delete',
-    method: 'delete',
-    params: query
-  })
-}
-
-// 装车
-export function deliveryLogDetCreate(data) {
-  return request({
-    url: '/extend/delivery-log-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得一条发货详细
-export function deliveryLogDetGet(query) {
-  return request({
-    url: '/extend/delivery-log-det/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 编辑发货详情
-export function deliveryLogDetUpdate(data) {
-  return request({
-    url: '/extend/delivery-log-det/update',
-    method: 'put',
-    data: data
-  })
-}

src/api/base/energyQuantityManual.js

@@ -0,0 +1,86 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-11 15:00:03
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-12 10:25:30
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获得分页数据
+export function energyQuantityManualPage(query) {
+  return request({
+    url: '/base/energy-quantity-manual/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建
+export function energyQuantityManualCreate(data) {
+  return request({
+    url: '/base/energy-quantity-manual/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新
+export function energyQuantityManualUpdate(data) {
+  return request({
+    url: '/base/energy-quantity-manual/update',
+    method: 'put',
+    data: data
+  })
+}
+
+//获得能源抄表（手动）
+export function energyQuantityManualGet(query) {
+  return request({
+    url: '/base/energy-quantity-manual/get',
+    method: 'get',
+    params: query
+  })
+}
+
+//删除
+export function energyQuantityManualDelete(query) {
+  return request({
+    url: '/base/energy-quantity-manual/delete',
+    method: 'delete',
+    params: query
+  })
+}
+
+//导出
+export function energyQuantityManualExport(query) {
+  return request({
+    url: '/base/energy-quantity-manual/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得能源表名配置分页
+export function energyTablePage() {
+  return request({
+    url: '/base/energy-type-meter-bind/list',
+    method: 'get',
+  })
+}
+// 获得能源表名配置
+export function energyTableGet(query) {
+  return request({
+    url: '/base/energy-type-meter-bind/list',
+    method: 'get',
+    params: query
+  })
+}
+// 更新能源表名配置
+export function energyTableUpdate(data) {
+  return request({
+    url: '/base/energy-type-meter-bind/update',
+    method: 'put',
+    data: data
+  })
+}

src/api/base/equipment.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建设备
 export function createEquipment(data) {
   return request({
-    url: '/base/core-equipment/create',
+    url: '/base/equipment/create',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function createEquipment(data) {
 // 更新设备
 export function updateEquipment(data) {
   return request({
-    url: '/base/core-equipment/update',
+    url: '/base/equipment/update',
     method: 'put',
     data: data
   })
@@ -21,7 +21,7 @@ export function updateEquipment(data) {
 // 删除设备
 export function deleteEquipment(id) {
   return request({
-    url: '/base/core-equipment/delete?id=' + id,
+    url: '/base/equipment/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -29,7 +29,7 @@ export function deleteEquipment(id) {
 // 获得设备
 export function getEquipment(id) {
   return request({
-    url: '/base/core-equipment/get?id=' + id,
+    url: '/base/equipment/get?id=' + id,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function getEquipment(id) {
 // 获得设备分页
 export function getEquipmentPage(query) {
   return request({
-    url: '/base/core-equipment/page',
+    url: '/base/equipment/page',
     method: 'get',
     params: query
   })
@@ -46,7 +46,7 @@ export function getEquipmentPage(query) {
 // 导出设备 Excel
 export function exportEquipmentExcel(query) {
   return request({
-    url: '/base/core-equipment/export-excel',
+    url: '/base/equipment/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'
@@ -55,7 +55,7 @@ export function exportEquipmentExcel(query) {
 // 获得所有设备列表
 export function getEquipmentAll() {
   return request({
-    url: '/base/core-equipment/listAll',
+    url: '/base/equipment/listAll',
     method: 'get'
   })
 }

src/api/base/equipmentConfig.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2024-02-21 13:43:02
+ * @LastEditTime: 2024-04-30 10:07:59
+ * @LastEditors: zwq
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 获得关联表名
+export function getplcAllList(query) {
+  return request({
+    url: '/base/equipment-plc/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备
+export function getEquipmentList(query) {
+  return request({
+    url: '/base/core-equipment/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据产线获得工段
+export function listByParentId(query) {
+  return request({
+    url: '/base/core-workshop-section/listByParentId',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得产线工段设备树形结构
+export function getTree(query) {
+  return request({
+    url: '/base/factory/getTree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备分组列表
+export function getgroupAllList(query) {
+  return request({
+    url: '/base/equipment-group/listAll',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/equipmentPlc.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-10-29 09:47:40
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-02-26 16:27:48
+ * @Description:
+ */
 import request from '@/utils/request'
 
 // 创建实时数据采集配置
@@ -52,3 +59,11 @@ export function exportEquipmentPlcExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 获得code
+export function getCode() {
+  return request({
+    url: '/base/equipment-group/getCode',
+    method: 'get'
+  })
+}

src/api/base/equipmentType.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建设备类型
 export function createEquipmentType(data) {
   return request({
-    url: '/base/core-equipment-type/create',
+    url: '/base/equipment-type/create',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function createEquipmentType(data) {
 // 更新设备类型
 export function updateEquipmentType(data) {
   return request({
-    url: '/base/core-equipment-type/update',
+    url: '/base/equipment-type/update',
     method: 'put',
     data: data
   })
@@ -21,7 +21,7 @@ export function updateEquipmentType(data) {
 // 删除设备类型
 export function deleteEquipmentType(id) {
   return request({
-    url: '/base/core-equipment-type/delete?id=' + id,
+    url: '/base/equipment-type/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -29,7 +29,7 @@ export function deleteEquipmentType(id) {
 // 获得设备类型
 export function getEquipmentType(id) {
   return request({
-    url: '/base/core-equipment-type/get?id=' + id,
+    url: '/base/equipment-type/get?id=' + id,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function getEquipmentType(id) {
 // 获得设备类型分页
 export function getEquipmentTypePage(query) {
   return request({
-    url: '/base/core-equipment-type/page',
+    url: '/base/equipment-type/page',
     method: 'get',
     params: query
   })
@@ -46,7 +46,7 @@ export function getEquipmentTypePage(query) {
 // 导出设备类型 Excel
 export function exportEquipmentTypeExcel(query) {
   return request({
-    url: '/base/core-equipment-type/export-excel',
+    url: '/base/equipment-type/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/base/factory.js

@@ -1,8 +1,15 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-10-29 09:47:40
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-02-12 09:25:11
+ * @Description:
+ */
 import request from '@/utils/request'
 // 获得工厂产线工段设备树形结构
 export function getTree() {
   return request({
-    url: '/base/core-factory/getTree',
+    url: '/base/factory/getTree',
     method: 'get'
   })
 }

src/api/base/groupTeamScheduling.js

@@ -33,3 +33,22 @@ export function autoSet(query) {
     params: query
   })
 }
+
+// 获得排班信息分页
+export function schedulingPage(query) {
+  return request({
+    url: '/base/group-team-scheduling/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出Excel
+export function exportSchedulingExcel(query) {
+  return request({
+    url: '/base/group-team-scheduling/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/base/material.js

@@ -1,13 +1,13 @@
 /*
- * @Author: Do not edit
+ * @Author: zwq
- * @Date: 2023-10-21 11:50:46
+ * @Date: 2024-04-09 16:42:19
- * @LastEditTime: 2024-07-05 10:09:18
  * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 14:33:52
  * @Description:
  */
 import request from '@/utils/request'
 
-// 创建物料
+// 创建原料
 export function createMaterial(data) {
   return request({
     url: '/base/material/create',
@@ -16,7 +16,7 @@ export function createMaterial(data) {
   })
 }
 
-// 更新物料
+// 更新原料
 export function updateMaterial(data) {
   return request({
     url: '/base/material/update',
@@ -25,7 +25,14 @@ export function updateMaterial(data) {
   })
 }
 
-// 删除物料
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/material/autoCode',
+    method: 'POST'
+  })
+}
+// 删除原料
 export function deleteMaterial(id) {
   return request({
     url: '/base/material/delete?id=' + id,
@@ -33,7 +40,7 @@ export function deleteMaterial(id) {
   })
 }
 
-// 获得物料
+// 获得原料
 export function getMaterial(id) {
   return request({
     url: '/base/material/get?id=' + id,
@@ -41,15 +48,7 @@ export function getMaterial(id) {
   })
 }
 
-// 获得物料code
+// 获得原料分页
-export function getCode() {
-  return request({
-    url: '/base/material/getMaterialCode',
-    method: 'get'
-  })
-}
-
-// 获得物料分页
 export function getMaterialPage(query) {
   return request({
     url: '/base/material/page',
@@ -57,146 +56,20 @@ export function getMaterialPage(query) {
     params: query
   })
 }
-
+// 获得原料列表
-// 获得物料列表
+export function getMaterialList() {
-export function getMaterialList(query) {
   return request({
-    url: '/base/core-product-material/listAll',
+    url: '/base/material/list',
     method: 'get',
-    params: query
   })
 }
 
-// 获得供应商所有列表
+// 导出原料 Excel
-export function getSupplierList(query) {
+export function exportMaterialExcel(query) {
   return request({
-    url: '/base/core-supplier/listAll',
+    url: '/base/material/export-excel',
     method: 'get',
-    params: query
+    params: query,
-  })
+    responseType: 'blob'
-}
-
-// 获得物料属性列表
-export function getMaterialAttrList(query) {
-  return request({
-    url: '/base/material-attr/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建物料属性
-export function createMaterialAttr(data) {
-  return request({
-    url: '/base/material-attr/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新物料属性
-export function updateMaterialAttr(data) {
-  return request({
-    url: '/base/material-attr/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除物料属性
-export function deleteMaterialAttr(id) {
-  return request({
-    url: '/base/material-attr/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得物料属性
-export function getMaterialAttr(query) {
-  return request({
-    url: '/base/material-attr/get',
-    method: 'get',
-    params: query
-  })
-}
-// 获得物料树结构
-export function getMaterialTree() {
-  return request({
-    url: '/base/core-product-material-type/listTree',
-    method: 'get'
-  })
-}
-
-// 创建物料树
-export function createMaterialTree(data) {
-  return request({
-    url: '/base/core-product-material-type/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新物料树
-export function updateMaterialTree(data) {
-  return request({
-    url: '/base/core-product-material-type/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除物料树
-export function deleteMaterialTree(id) {
-  return request({
-    url: '/base/core-product-material-type/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得产品物料分页
-export function getProductMaterialPage(query) {
-  return request({
-    url: '/base/core-product-material/page',
-    method: 'get',
-    params: query
-  })
-}
-// 删除产品物料
-export function deleteProductMaterial(id) {
-  return request({
-    url: '/base/core-product-material/delete?id=' + id,
-    method: 'delete'
-  })
-}
-// 创建产品物料
-export function createProductMaterial(data) {
-  return request({
-    url: '/base/core-product-material/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新产品物料
-export function updateProductMaterial(data) {
-  return request({
-    url: '/base/core-product-material/update',
-    method: 'put',
-    data: data
-  })
-}
-// 获得产品物料
-export function getProductMaterial(id) {
-  return request({
-    url: '/base/core-product-material/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得产品物料code
-export function getProductMaterialCode() {
-  return request({
-    url: '/base/core-product-material/getCode',
-    method: 'POST'
   })
 }

src/api/base/materialDate.js

@@ -1,68 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-24 17:09:59
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建物料批次
-export function createMaterialDate(data) {
-  return request({
-    url: '/base/material-date/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新物料批次
-export function updateMaterialDate(data) {
-  return request({
-    url: '/base/material-date/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除物料批次
-export function deleteMaterialDate(id) {
-  return request({
-    url: '/base/material-date/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得物料批次
-export function getMaterialDate(id) {
-  return request({
-    url: '/base/material-date/getDetail?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得物料批次code
-export function getCode() {
-  return request({
-    url: '/base/material-date/getMaterialDateCode',
-    method: 'get'
-  })
-}
-
-// 获得物料批次分页
-export function getMaterDatePage(query) {
-  return request({
-    url: '/base/material-date/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得物料批次列表
-export function getMaterDateList(query) {
-  return request({
-    url: '/base/material-date/listbyfilter',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/materialPricing.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-09 16:42:19
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-10 14:31:46
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原料
+export function createMaterialPricing(data) {
+  return request({
+    url: '/base/material-pricing/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原料
+export function updateMaterialPricing(data) {
+  return request({
+    url: '/base/material-pricing/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/material-pricing/autoCode',
+    method: 'POST'
+  })
+}
+// 删除原料
+export function deleteMaterialPricing(id) {
+  return request({
+    url: '/base/material-pricing/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原料
+export function getMaterialPricing(id) {
+  return request({
+    url: '/base/material-pricing/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原料分页
+export function getMaterialPricingPage(query) {
+  return request({
+    url: '/base/material-pricing/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原料 Excel
+export function exportMaterialPricingExcel(query) {
+  return request({
+    url: '/base/material-pricing/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/base/materialProductBom.js

@@ -1,120 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-27 17:54:28
- * @LastEditors: DY
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建产品Bom
-export function createMaterialPB(data) {
-  return request({
-    url: '/base/material-product-bom/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新产品Bom
-export function updateMaterialPB(data) {
-  return request({
-    url: '/base/material-product-bom/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除产品Bom
-export function deleteMaterialPB(id) {
-  return request({
-    url: '/base/material-product-bom/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得产品Bom
-export function getMaterialPB(id) {
-  return request({
-    url: '/base/material-product-bom/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得产品Bomcode
-export function getCode() {
-  return request({
-    url: '/base/material-product-bom/getMaterialProductBomCode',
-    method: 'get'
-  })
-}
-
-// 获得产品Bom分页
-export function getMaterialPBPage(query) {
-  return request({
-    url: '/base/material-product-bom/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得产品Bom列表
-export function getMaterialPBList(query) {
-  return request({
-    url: '/base/material-product-bom/listbyfilter',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得产品列表
-export function getProList(query) {
-  return request({
-    url: '/base/core-product-material/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得产品Bom详细分页
-export function getProBomList(query) {
-  return request({
-    url: '/base/material-product-bom-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建产品Bom详细
-export function createMaterialPBDet(data) {
-  return request({
-    url: '/base/material-product-bom-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新产品Bom详细
-export function updateMaterialPBDet(data) {
-  return request({
-    url: '/base/material-product-bom-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除产品Bom详细
-export function deleteMaterialPBDet(id) {
-  return request({
-    url: '/base/material-product-bom-det/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得产品Bom详细
-export function getMaterialPBDet(id) {
-  return request({
-    url: '/base/material-product-bom-det/get?id=' + id,
-    method: 'get'
-  })
-}

src/api/base/materialUseLog.js

@@ -1,69 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-26 09:32:21
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建物料使用记录
-export function createMaterialLog(data) {
-  return request({
-    url: '/base/material-use-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新物料使用记录
-export function updateMaterialLog(data) {
-  return request({
-    url: '/base/material-use-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得物料使用记录
-export function getMaterialLog(id) {
-  return request({
-    url: '/base/material-use-log/getDetail?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得物料使用记录分页
-export function getMaterialLogPage(query) {
-  return request({
-    url: '/base/material-use-log/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有设备列表
-export function getEqListAll(query) {
-  return request({
-    url: '/base/core-equipment/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有员工列表
-export function getworkerAll(query) {
-  return request({
-    url: '/base/core-worker/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除物料使用记录
-export function deleteMaterialLog(id) {
-  return request({
-    url: '/base/material-use-log/delete?id=' + id,
-    method: 'delete'
-  })
-}

src/api/base/modelType.js

@@ -1,68 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-18 09:33:57
- * @LastEditTime: 2023-10-18 16:02:09
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建包装
-export function createPackingType(data) {
-  return request({
-    url: '/base/packaging-print-type/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得包装code
-export function getCode() {
-  return request({
-    url: '/base/packaging-print-log/getPackagingSerialCode',
-    method: 'get'
-  })
-}
-// 更新包装
-export function updatePackingType(data) {
-  return request({
-    url: '/base/packaging-print-type/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除包装
-export function deletePackingType(id) {
-  return request({
-    url: '/base/packaging-print-type/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得包装
-export function getPackingType(id) {
-  return request({
-    url: '/base/packaging-print-type/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得包装分页
-export function getPackingTypePage(query) {
-  return request({
-    url: '/base/packaging-print-type/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出包装 Excel
-export function exportPackingExcel(query) {
-  return request({
-    url: '/base/packaging-print-type/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/base/orderGroup.js

@@ -1,72 +0,0 @@
-import request from '@/utils/request'
-// 获得集团订单分页
-export function getOrderGroupPage(query) {
-  return request({
-    url: '/base/order-group/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得集团订单
-export function getOrderGroup(query) {
-  return request({
-    url: '/base/order-group/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 更新集团订单
-export function updateOrderGroup(data) {
-  return request({
-    url: '/base/order-group/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 创建集团订单
-export function createOrderGroup(data) {
-  return request({
-    url: '/base/order-group/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改集团订单状态，结束-终止-作废用
-export function groupOrderStatusSet(data) {
-  return request({
-    url: '/base/order-group/groupOrderStatusSet',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得集团订单详情
-export function orderGroupDetail(query) {
-  return request({
-    url: '/base/order-group/getDetail',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建集团订单与厂务订单表关联表 一对多
-export function orderConGroupOrder(data) {
-  return request({
-    url: '/base/order-con-group-order/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 订单监控
-export function orderGroupMonitor(query) {
-  return request({
-    url: '/base/order-group/orderGroupMonitor',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/orderManage.js

@@ -1,224 +0,0 @@
-import request from '@/utils/request'
-// 条件获得订单列表
-export function orderList(query) {
-  return request({
-    url: '/base/order/listbyfilter',
-    method: 'get',
-    params: query
-  })
-}
-
-// 条件获得工单列表
-export function workOrderList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得订单分页
-export function getOrderPage(query) {
-  return request({
-    url: '/base/order/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取订单code
-export function getOrderCode() {
-  return request({
-    url: '/base/order/getOrderCode',
-    method: 'get'
-  })
-}
-
-// 获取工单code
-export function getWorkOrderCode() {
-  return request({
-    url: '/base/order/getWorkOrderCode',
-    method: 'get'
-  })
-}
-
-// 获得订单
-export function getOrderById(query) {
-  return request({
-    url: '/base/order/get',
-    method: 'get',
-    params: query
-  })
-}
-// 订单进度-获取普通模式订单剩余数量
-export function getOrderRemainNum(id) {
-  return request({
-    url: '/base/order/getOrderRemainNum?id=' + id,
-    method: 'get'
-  })
-}
-
-// 订单进度-获取工艺模式订单预计消耗物料（计算后）
-export function getMaterialCostOrder(data) {
-  return request({
-    url: '/extend/process-retrospect/getMaterialCostOrder',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得工艺流程列表
-export function getProcessFlowList() {
-  return request({
-    url: '/extend/process-flow/listAll',
-    method: 'get'
-  })
-}
-
-
-// 获得工艺流程列表
-export function getProcessFlowPage(query) {
-  return request({
-    url: '/extend/process-flow/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建订单
-export function orderCreate(data) {
-  return request({
-    url: '/base/order/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新订单
-export function orderUpdate(data) {
-  return request({
-    url: '/base/order/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除订单
-export function orderDelete(query) {
-  return request({
-    url: '/base/order/delete',
-    method: 'delete',
-    params: query
-  })
-}
-
-// 下发订单，绑定的穿工单id，新建不传
-export function orderIssue(data) {
-  return request({
-    url: '/base/order/issue',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得工单
-export function getWorkOrderById(query) {
-  return request({
-    url: '/base/core-work-order/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 订单监控
-export function orderMonitor(query) {
-  return request({
-    url: '/base/order/orderMonitor',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取订单绑定的工单和数量信息，可传订单id列表，map索引为订单id
-export function orderAssignmentList(query) {
-  return request({
-    url: '/base/order/orderAssignmentList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有客户列表
-export function customerList() {
-  return request({
-    url: 'base/core-customer/listAll',
-    method: 'get'
-  })
-}
-
-// 获得订单详情
-export function orderDetail(query) {
-  return request({
-    url: '/base/order/getDetail',
-    method: 'get',
-    params: query
-  })
-}
-
-// 产品bom消耗信息
-export function bomUseNum(query) {
-  return request({
-    url: '/base/material-product-bom/bomUseNum',
-    method: 'get',
-    params: query
-  })
-}
-
-// 完成订单
-export function orderFinish(query) {
-  return request({
-    url: '/base/order/finish',
-    method: 'post',
-    params: query
-  })
-}
-
-// 作废订单
-export function orderVoid(data) {
-  return request({
-    url: 'base/order/invalid',
-    method: 'put',
-    data
-  })
-}
-
-export function orderSplit(data) {
-  return request({
-    url: '/base/order/split',
-    method: 'post',
-    data
-  })
-}
-
-export function getDetailTree(data) {
-  return request({
-    url: 'base/order/getDetailTree',
-    method: 'get',
-    params: data
-  })
-}
-export function getDetailTreeInfo(query) {
-  return request({
-    url: 'base/order/getDetailTreeInfoByIdNew',
-    method: 'get',
-    params: query
-  })
-}
-
-export function orderStop(data) {
- return request({
-    url: 'base/order/stop',
-    method: 'post',
-    params: data
-  })
-}

src/api/base/packingInfo.js

@@ -1,92 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-18 09:33:57
- * @LastEditTime: 2023-10-18 16:18:12
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建包装
-export function createPacking(data) {
-  return request({
-    url: '/base/packaging-print-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得包装code
-export function getCode() {
-  return request({
-    url: '/base/packaging-print-log/getPackagingSerialCode',
-    method: 'get'
-  })
-}
-// 更新包装
-export function updatePacking(data) {
-  return request({
-    url: '/base/packaging-print-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除包装
-export function deletePacking(id) {
-  return request({
-    url: '/base/packaging-print-log/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得包装
-export function getPacking(id) {
-  return request({
-    url: '/base/packaging-print-log/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得包装分页
-export function getPackingPage(query) {
-  return request({
-    url: '/base/packaging-print-log/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出包装 Excel
-export function exportPackingExcel(query) {
-  return request({
-    url: '/base/packaging-print-log/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-export function getWorkOrderList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function getCustomerList(query) {
-  return request({
-    url: '/base/core-customer/listAll',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function getModelList(query) {
-  return request({
-    url: '/base/packaging-print-model/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}

src/api/base/printModel.js

@@ -1,92 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-18 09:33:57
- * @LastEditTime: 2023-10-19 15:28:00
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建包装
-export function createPackingModel(data) {
-  return request({
-    url: '/base/packaging-print-model/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得包装code
-// export function getCode() {
-//   return request({
-//     url: '/base/packaging-print-log/getPackagingSerialCode',
-//     method: 'get'
-//   })
-// }
-// 更新包装
-export function updatePackingModel(data) {
-  return request({
-    url: '/base/packaging-print-model/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除包装
-export function deletePackingModel(id) {
-  return request({
-    url: '/base/packaging-print-model/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得包装
-export function getPackingModel(id) {
-  return request({
-    url: '/base/packaging-print-model/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得包装分页
-export function getPackingModelPage(query) {
-  return request({
-    url: '/base/packaging-print-model/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出包装 Excel
-// export function exportPackingExcel(query) {
-//   return request({
-//     url: '/base/packaging-print-log/export-excel',
-//     method: 'get',
-//     params: query,
-//     responseType: 'blob'
-//   })
-// }
-
-// export function getWorkOrderList(query) {
-//   return request({
-//     url: '/base/core-work-order/listbyfilter',
-//     method: 'get',
-//     params: query,
-//   })
-// }
-
-// export function getCustomerList(query) {
-//   return request({
-//     url: '/base/core-customer/listAll',
-//     method: 'get',
-//     params: query,
-//   })
-// }
-
-export function getTypeList(query) {
-  return request({
-    url: '/base/packaging-print-type/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}

src/api/base/product.js

@@ -1,16 +0,0 @@
-import request from '@/utils/request'
-// 获得物料列表（包括产品）
-export function getProductAll() {
-  return request({
-    url: '/base/core-product-material/listAll',
-    method: 'get'
-  })
-}
-// 获得产品列表
-export function getProductList() {
-  return request({
-    url: '/base/core-product-material/listAllProduct',
-    method: 'get'
-  })
-}
-

src/api/base/productionLine.js

@@ -1,8 +1,23 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-03-27 15:49:55
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-10 14:36:19
+ * @Description:
+ */
 import request from '@/utils/request'
 // 获得所有工厂产线列表
 export function getLineAll() {
   return request({
-    url: '/base/core-production-line/listAll',
+    url: '/base/production-line/listAll',
     method: 'get'
   })
-}
+}
+// 获得产线分页
+export function getLinePage(query) {
+  return request({
+    url: '/base/production-line/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/qualityInspectionDet.js

@@ -1,10 +1,3 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-17 09:26:38
- * @LastEditTime: 2023-11-20 15:50:08
- * @LastEditors: zhp
- * @Description:
- */
 import request from '@/utils/request'
 
 // 创建质量检测信息基础
@@ -59,11 +52,3 @@ export function exportQualityInspectionDetExcel(query) {
     responseType: 'blob'
   })
 }
-
-export function getQualityInspectionDetList(query) {
-  return request({
-    url: '/base/quality-inspection-det/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/qualityScrapDet.js

@@ -1,69 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-11-06 15:38:12
- * @LastEditTime: 2023-11-06 15:39:39
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建质量检测类型基础
-export function createQualityScrapDet(data) {
-  return request({
-    url: '/base/quality-scrap-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新质量检测类型基础
-export function updateQualityScrapDet(data) {
-  return request({
-    url: '/base/quality-scrap-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除质量检测类型基础
-export function deleteQualityScrapDet(id) {
-  return request({
-    url: '/base/quality-scrap-det/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得质量检测类型基础
-export function getQualityScrapDet(id) {
-  return request({
-    url: '/base/quality-scrap-det/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得质量检测类型基础分页
-export function getQualityScrapDetPage(query) {
-  return request({
-    url: '/base/quality-scrap-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出质量检测类型基础 Excel
-export function exportQualityScrapTypeExcel(query) {
-  return request({
-    url: '/base/quality-scrap-type/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-export function getCode(query) {
-  return request({
-    url: '/base/quality-scrap-det/getCode',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/qualityScrapLog.js

@@ -1,100 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-11-07 15:02:37
- * @LastEditTime: 2023-11-07 18:32:07
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建质量检测类型基础
-export function createQualityScrapLog(data) {
-  return request({
-    url: '/base/quality-scrap-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新质量检测类型基础
-export function updateQualityScrapLog(data) {
-  return request({
-    url: '/base/quality-scrap-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除质量检测类型基础
-export function deleteQualityScrapLog(id) {
-  return request({
-    url: '/base/quality-scrap-log/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得质量检测类型基础
-export function getQualityScrapLog(id) {
-  return request({
-    url: '/base/quality-scrap-log/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得质量检测类型基础分页
-export function getQualityScrapLogPage(query) {
-  return request({
-    url: '/base/quality-scrap-log/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出质量检测类型基础 Excel
-export function exportQualityScrapTypeExcel(query) {
-  return request({
-    url: '/base/quality-scrap-type/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-export function getCode(query) {
-  return request({
-    url: '/base/quality-scrap-log/getCode',
-    method: 'get',
-    params: query
-  })
-}
-export function getWorkOrderList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function getTeamList(query) {
-  return request({
-    url: '/base/group-team/listAll',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function getLineList(query) {
-  return request({
-    url: '/base/core-production-line/listAll',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function getDetList(query) {
-  return request({
-    url: '/base/quality-scrap-det/listAll',
-    method: 'get',
-    params: query,
-  })
-}

src/api/base/qualityScrapType.js

@@ -1,76 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-11-04 18:27:11
- * @LastEditTime: 2023-11-06 15:55:24
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建质量检测类型基础
-export function createQualityScrapType(data) {
-  return request({
-    url: '/base/quality-scrap-type/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新质量检测类型基础
-export function updateQualityScrapType(data) {
-  return request({
-    url: '/base/quality-scrap-type/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除质量检测类型基础
-export function deleteQualityScrapType(id) {
-  return request({
-    url: '/base/quality-scrap-type/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得质量检测类型基础
-export function getQualityScrapType(id) {
-  return request({
-    url: '/base/quality-scrap-type/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得质量检测类型基础分页
-export function getQualityScrapTypePage(query) {
-  return request({
-    url: '/base/quality-scrap-type/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出质量检测类型基础 Excel
-export function exportQualityScrapTypeExcel(query) {
-  return request({
-    url: '/base/quality-scrap-type/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-export function getCode(query) {
-  return request({
-    url: '/base/quality-scrap-type/getCode',
-    method: 'get',
-    params: query
-  })
-}
-export function getList(query) {
-  return request({
-    url: 'base/quality-scrap-type/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/base/workOrder.js

@@ -1,8 +0,0 @@
-import request from '@/utils/request'
-// 获得工单列表
-export function workOrderList() {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get'
-  })
-}

src/api/base/workshopSection.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // 获得所有产线工段列表
 export function getWorkShopAll() {
   return request({
-    url: '/base/core-workshop-section/listAll',
+    url: '/base/workshop-section/listAll',
     method: 'get'
   })
 }

src/api/core/analysis/index.js

@@ -1,25 +1,47 @@
 /*
  * @Author: zhp
  * @Date: 2023-09-12 14:07:04
- * @LastEditTime: 2023-11-10 10:23:43
+ * @LastEditTime: 2025-01-08 15:47:17
- * @LastEditors: DY
+ * @LastEditors: zwq
  * @Description:
  */
 import request from '@/utils/request'
 
-export function getYieldAnalysisPageData(query) {
+export function getYieldAnalysisPageData(data) {
   return request({
-    url: '/base/core-production-line-rec-day/monthList',
+    url: '/analysis/production-analysis/getOutput',
-    method: 'get',
-    params: query
-  })
-}
-
-// 产线平衡分析
-export function getCT(data) {
-  return request({
-    url: '/analysis/equipment-analysis/getCT',
     method: 'post',
     data: data
   })
 }
+
+export function getCT(data) {
+  return request({
+    url: '/analysis/production-analysis/getCT',
+    method: 'post',
+    data: data
+  })
+}
+// 获取产线平衡分析数据（new）
+export function getNewCTNow(data) {
+  return request({
+    url: '/analysis/production-analysis/getNewCTNow',
+    method: 'post',
+    data: data
+  })
+}
+// 获取产线平衡分析数据趋势图（new）
+export function getNewCTCharts(data) {
+  return request({
+    url: '/analysis/production-analysis/getNewCTCharts',
+    method: 'post',
+    data: data
+  })
+}
+// 获取产线平衡分析数据设备list（new）
+export function getNewCTDet(id) {
+  return request({
+    url: '/analysis/production-analysis/getNewCTDet?lineId='+id,
+    method: 'get',
+  })
+}

src/api/core/base/factory.js

@@ -1,16 +1,9 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 10:11:01
- * @LastEditTime: 2023-11-03 19:03:44
- * @LastEditors: DY
- * @Description: 
- */
 import request from '@/utils/request'
 
 // 创建工厂
 export function createFactory(data) {
   return request({
-    url: '/base/core-factory/create',
+    url: '/base/factory/create',
     method: 'post',
     data: data
   })
@@ -19,7 +12,7 @@ export function createFactory(data) {
 // 更新工厂
 export function updateFactory(data) {
   return request({
-    url: '/base/core-factory/update',
+    url: '/base/factory/update',
     method: 'put',
     data: data
   })
@@ -28,7 +21,7 @@ export function updateFactory(data) {
 // 删除工厂
 export function deleteFactory(id) {
   return request({
-    url: '/base/core-factory/delete?id=' + id,
+    url: '/base/factory/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -36,30 +29,21 @@ export function deleteFactory(id) {
 // 获得工厂
 export function getFactory(id) {
   return request({
-    url: '/base/core-factory/get?id=' + id,
+    url: '/base/factory/get?id=' + id,
     method: 'get'
   })
 }
 // 获得工厂code
 export function getCode() {
   return request({
-    url: '/base/core-factory/getCode',
+    url: '/base/factory/getCode',
     method: 'get'
   })
 }
 // 获得工厂分页
 export function getFactoryPage(query) {
   return request({
-    url: '/base/core-factory/page',
+    url: '/base/factory/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getFactoryList(query) {
-  return request({
-    url: '/base/core-factory/listAll',
     method: 'get',
     params: query
   })
@@ -68,9 +52,18 @@ export function getFactoryList(query) {
 // 导出工厂 Excel
 export function exportFactoryExcel(query) {
   return request({
-    url: '/base/core-factory/export-excel',
+    url: '/base/factory/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'
   })
 }
+// 获取产线设备状态
+export function getLineEqStatus(data) {
+  return request({
+    url: '/base/production-line/getLineEqStatus',
+    method: 'post',
+    data: data
+  })
+}
+

src/api/core/base/lineBindProcess.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+
+// 切换工艺
+export function switchLineBindProcess(data) {
+  return request({
+    url: '/base/line-bind-process/switch',
+    method: 'put',
+    data: data
+  })
+}
+// 获得产线工艺目前生产工艺
+export function getLineBindProcessPage(query) {
+  return request({
+    url: '/base/line-bind-process/nowList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得产线工艺log分页
+export function getLineBindProcessLogPage(query) {
+  return request({
+    url: '/base/line-bind-process/logPage',
+    method: 'get',
+    params: query
+  })
+}

src/api/core/base/lineBindProduct.js

@@ -16,6 +16,14 @@ export function switchLineBindProduct(data) {
     data: data
   })
 }
+// 切换产线是否可以自动
+export function switchAutoProduct(data) {
+  return request({
+    url: '/base/line-bind-product/switchAuto',
+    method: 'put',
+    data: data
+  })
+}
 // 更新产线目前生产产品表 主要为更新
 export function updateLineBindProduct(data) {
   return request({

src/api/core/monitoring/auto.js

@@ -1,9 +1,9 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-09-12 09:44:53
- * @LastEditTime: 2023-09-13 16:11:41
+ * @LastEditTime: 2025-01-07 09:57:36
- * @LastEditors: DY
+ * @LastEditors: zwq
- * @Description: 
+ * @Description:
  */
 import request from '@/utils/request'
 
@@ -17,9 +17,52 @@ export function getPdlAutoReport(data) {
 }
 
 // 获得所有工厂产线列表
-export function getPdList() {
+export function getPdList(id) {
   return request({
-    url: '/base/production-line/listAll',
+    url: '/base/production-line/listAll' + (id ? '?id=' + id : ''),
     method: 'get'
   })
-}
+}
+// 获得产线自动报表
+export function getLineAuto(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlAutoReportNew',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得产品自动报表
+export function getProductAuto(data) {
+  return request({
+    url: '/monitoring/production-monitor/getProcessAutoReportNew',
+    method: 'post',
+    data: data
+  })
+}
+
+// 班组自动报表分页
+export function getTeamReportPage(data) {
+  return request({
+		url: '/monitoring/group-off-record/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+// 班组自动报表分页详细
+export function getTeamReportPageDet(id) {
+  return request({
+    url: '/monitoring/group-off-record/get?id=' + id,
+    method: 'get',
+  })
+}
+
+export function exportGroupProductReportExcel(data) {
+  return request({
+		url: '/monitoring/group-off-record/export-det-excel',
+		method: 'get',
+		params: data,
+		responseType: 'blob',
+	});
+}

src/api/core/monitoring/data.js

@@ -1,9 +1,9 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-09-12 09:44:53
- * @LastEditTime: 2023-09-14 10:25:46
+ * @LastEditTime: 2025-03-03 10:43:34
- * @LastEditors: DY
+ * @LastEditors: zwq
- * @Description: 
+ * @Description:
  */
 import request from '@/utils/request'
 
@@ -22,4 +22,22 @@ export function getPdList() {
     url: '/base/production-line/listAll',
     method: 'get'
   })
-}
+}
+// 产线统计数据查询-历史
+export function getPdlAutoReportNewSearch(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlAutoReportNewSearch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 产线统计数据查询-当前
+export function getPdlAutoReportNewSearchNow(data) {
+  return request({
+    url: '/monitoring/production-monitor/getPdlAutoReportNewSearchNow',
+    method: 'post',
+    data: data,
+    timeout: 60000,
+  })
+}

src/api/core/monitoring/data24.js

@@ -1,17 +1,17 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-09-12 09:44:53
- * @LastEditTime: 2023-11-06 18:57:05
+ * @LastEditTime: 2023-09-15 14:12:26
  * @LastEditors: DY
  * @Description: 
  */
 import request from '@/utils/request'
 
 // 获得近24小时产线生产数据
-export function getPdlDataOneDay(query) {
+export function getPdlDataOneDay(data) {
   return request({
-    url: '/base/core-production-line-rec-hour/list24h',
+    url: '/monitoring/production-monitor/getPdlDataOneDay',
-    method: 'get',
+    method: 'post',
-    params: query
+    data: data
   })
 }

src/api/cost/allCost.js

@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:35:13
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得总成本统计-按日期分页
+export function getCostSumPage(query) {
+  return request({
+    url: '/monitoring/cost-sum/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新总成本统计-按日期
+export function updateCostSum(data) {
+  return request({
+    url: '/monitoring/cost-sum/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片成本统计成本查询分页
+export function getRawCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-sum/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出总成本统计-按日期 Excel
+export function exportCostSumExcel(query) {
+  return request({
+    url: '/monitoring/cost-sum/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片成本统计-历史成本 Excel
+export function exportRawCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-sum/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costDeepRatioHis.js

@@ -0,0 +1,55 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:00:09
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工良品率
+export function updateDeepRatioHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工产线良品率
+export function getDeepPDRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/page-pd',
+    method: 'get',
+    params: query
+  })
+}
+// 获得深加工工段良品率
+export function getDeepWSRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/page-ws',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工工段良品率 Excel
+export function exportDeepWSRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/export-excel-ws',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+
+// 导出深加工产线良品率 Excel
+export function exportDeepPDRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-ratio-his/export-excel-pd',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+

src/api/cost/costEnergy.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-19 16:11:19
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片能源历史
+export function updateEnergyHis(data) {
+  return request({
+    url: '/monitoring/cost-energy-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片能源历史分页
+export function getEnergyHisPage(query) {
+  return request({
+    url: '/monitoring/cost-energy-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原片能源-成本查询分页
+export function getEnergyRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-energy-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+// 导出能源成本成本查询 Excel
+export function exportEnergyRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-energy-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出能源成本历史 Excel
+export function exportEnergyHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-energy-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costEnergyDeep.js

@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:19:24
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工能源历史
+export function updateEnergyHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工能源历史分页
+export function getEnergyHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得深加工能源-成本查询分页
+export function getEnergyRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工能源成本成本查询 Excel
+export function exportEnergyRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出深加工能源成本历史 Excel
+export function exportEnergyHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-energy-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costMaterial.js

@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-05 13:55:30
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原料成本-历史
+export function updateMaterialHis(data) {
+  return request({
+    url: '/monitoring/cost-material-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原料成本-历史分页
+export function getMaterialHisPage(query) {
+  return request({
+    url: '/monitoring/cost-material-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原料成本-成本查询分页
+export function getMaterialRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-material-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原料成本成本查询 Excel
+export function exportMaterialRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-material-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原料成本历史 Excel
+export function exportMaterialHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-material-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costOriginRatioHis.js

@@ -0,0 +1,36 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 10:53:55
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片良品率
+export function updatecostOriginRatioHis(data) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片良品率
+export function getcostOriginRatioHisPage(query) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片良品率 Excel
+export function exportcostOriginRatioHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-origin-ratio-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+

src/api/cost/costOthercostHis.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-19 14:24:17
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新原片其他成本-历史
+export function updateRawOthercostHis(data) {
+  return request({
+    url: '/monitoring/cost-othercost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片其他成本-历史分页
+export function getRawOthercostHisPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得原片其他成本-成本查询分页
+export function getRawOthercostSunPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/page-sum',
+    method: 'get',
+    params: query
+  })
+}
+// 导出原片其他成本-成本查询 Excel
+export function exportRawOthercostSunExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片其他成本-历史 Excel
+export function exportRawOthercostHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costOthercostHisDeep.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 15:13:20
+ * @Description:
+ */
+
+import request from '@/utils/request'
+// 更新深加工其他成本-历史
+export function updateRawOthercostHis(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工其他成本-历史分页
+export function getRawOthercostHisPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得深加工其他成本-成本查询分页
+export function getRawOthercostSunPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/page-sum',
+    method: 'get',
+    params: query
+  })
+}
+// 导出深加工其他成本-成本查询 Excel
+export function exportRawOthercostSunExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出深加工其他成本-历史 Excel
+export function exportRawOthercostHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/costOthercostLog.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:12:09
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原片其他成本-记录
+export function createRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-othercost-log/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原片其他成本-记录
+export function updateRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-othercost-log/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原片其他成本-记录
+export function deleteRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-othercost-log/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原片其他成本-记录
+export function getRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-othercost-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原片其他成本-记录分页
+export function getRawOthercostLogPage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片其他成本-记录 Excel
+export function exportRawOthercostLogExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-log/export-log-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有原片其他成本-记录列表
+export function getRawOthercostLogAll() {
+  return request({
+    url: '/monitoring/cost-othercost-log/listAll',
+    method: 'get'
+  })
+}

src/api/cost/costOthercostLogDeep.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 14:59:35
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建深加工其他成本-记录
+export function createRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新深加工其他成本-记录
+export function updateRawOthercostLog(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除深加工其他成本-记录
+export function deleteRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得深加工其他成本-记录
+export function getRawOthercostLog(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得深加工其他成本-记录分页
+export function getRawOthercostLogPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工其他成本-记录 Excel
+export function exportRawOthercostLogExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/export-log-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有深加工其他成本-记录列表
+export function getRawOthercostLogAll() {
+  return request({
+    url: '/monitoring/cost-deep-othercost-log/listAll',
+    method: 'get'
+  })
+}

src/api/cost/deepCostStatistics.js

@@ -0,0 +1,53 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-02 14:43:30
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得深加工成本分页
+export function getDeepCostStatisticsPage(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新深加工成本-历史
+export function updateDeepCostStatistics(data) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得深加工成本统计成本查询分页
+export function getDeepCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工成本统计成本查询 Excel
+export function exportDeepStatisticsRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 导出深加工成本统计-历史成本 Excel
+export function exportDeepCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-cost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/deepOthercostRule.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-22 14:55:00
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建深加工其他成本-配置
+export function createRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新深加工其他成本-配置
+export function updateRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除深加工其他成本-配置
+export function deleteRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得深加工其他成本-配置
+export function getRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得深加工其他成本-配置分页
+export function getRawOthercostRulePage(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出深加工其他成本-配置 Excel
+export function exportRawOthercostRuleExcel(query) {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有深加工其他成本-配置列表
+export function getRawOthercostRuleAll() {
+  return request({
+    url: '/monitoring/cost-deep-othercost-rule/listAll',
+    method: 'get'
+  })
+}

src/api/cost/rawCostStatistics.js

@@ -0,0 +1,54 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-18 16:53:17
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-06 14:35:13
+ * @Description:
+ */
+
+import request from '@/utils/request'
+
+// 获得原片成本分页
+export function getRawCostStatisticsPage(query) {
+  return request({
+    url: '/monitoring/cost-origincost-his/page',
+    method: 'get',
+    params: query
+  })
+}
+// 更新原片成本-历史
+export function updateRawCostStatistics(data) {
+  return request({
+    url: '/monitoring/cost-origincost-his/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获得原片成本统计成本查询分页
+export function getRawCostStatisticsRealtimePage(query) {
+  return request({
+    url: '/monitoring/cost-origin-cost-realtime/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片成本统计成本查询 Excel
+export function exportRawStatisticsRealtimeExcel(query) {
+  return request({
+    url: '/monitoring/cost-origin-cost-realtime/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 导出原片成本统计-历史成本 Excel
+export function exportRawCostStatisticsHisExcel(query) {
+  return request({
+    url: '/monitoring/cost-origincost-his/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/cost/rawOthercostRule.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-04-15 17:01:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-18 15:39:12
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 创建原片其他成本-配置
+export function createRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新原片其他成本-配置
+export function updateRawOthercostRule(data) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除原片其他成本-配置
+export function deleteRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得原片其他成本-配置
+export function getRawOthercostRule(id) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得原片其他成本-配置分页
+export function getRawOthercostRulePage(query) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出原片其他成本-配置 Excel
+export function exportRawOthercostRuleExcel(query) {
+  return request({
+    url: '/monitoring/cost-othercost-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+// 获得所有原片其他成本-配置列表
+export function getRawOthercostRuleAll() {
+  return request({
+    url: '/monitoring/cost-othercost-rule/listAll',
+    method: 'get'
+  })
+}

src/api/equipment/analysis/statistics.js

@@ -1,37 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-10 09:27:39
- * @LastEditTime: 2023-11-10 09:30:00
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 获得设备统计分析
-export function getEqAnalysis(query) {
-  return request({
-    url: '/analysis/equipment-analysis/statistics',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出设备统计分析
-export function exportEqAnalysisExcel(query) {
-  return request({
-    url: '/analysis/equipment-analysis/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 导出设备状态追溯
-export function exportEfficiencyExcel(query) {
-  return request({
-    url: '/analysis/equipment-analysis/export-efficiency',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/equipment/base/alarm/records.js

@@ -1,60 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-09 17:42:27
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建设备报警处理
-export function createAlarmHand(data) {
-  return request({
-    url: '/base/equipment-alarm-hand/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新设备报警处理
-export function updateAlarmHand(data) {
-  return request({
-    url: '/base/equipment-alarm-hand/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除设备报警处理
-export function deleteAlarmHand(id) {
-  return request({
-    url: '/base/equipment-alarm-hand/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-//获得设备报警处理
-export function getAlarmHand(id) {
-  return request({
-    url: '/base/equipment-alarm-hand/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得设备报警处理分页
-export function getAlarmHandPage(query) {
-  return request({
-    url: '/base/equipment-alarm-hand/page',
-    method: 'get',
-    params: query
-  })
-}
-
-
-//获得设备报警记录
-export function getAlarmLog(id) {
-  return request({
-    url: '/base/equipment-alarm-log/get?id=' + id,
-    method: 'get'
-  })
-}

src/api/equipment/base/inspection/items.js

@@ -1,54 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2024-07-23 13:44:00
- * @LastEditTime: 2024-07-31 09:34:17
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-
-export function deleteData(id) {
-  return request({
-    url: '/base/equipment-check-program/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-export function getItemPageData(data) {
-  return request({
-    url: '/base/equipment-check-program/page',
-    method: 'get',
-    params: data
-  })
-}
-
-export function getItemData(id) {
-  return request({
-    url: 'base/equipment-check-program/get?id=' + id,
-    method: 'get'
-  })
-}
-
-export function updateItemData(data) {
-  return request({
-    url: 'base/equipment-check-program/update',
-    method: 'put',
-    data
-  })
-}
-
-export function createItemData(data) {
-  return request({
-    url: 'base/equipment-check-program/create',
-    method: 'post',
-    data
-  })
-}
-
-export function deleteProgramTypeData(id) {
-  return request({
-    url: 'base/equipment-check-program-type/delete?id=' + id,
-    method: 'delete'
-  })
-}

src/api/equipment/base/inspection/record.js

@@ -1,133 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2024-02-28 18:16:56
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 根据设备获得所有巡检内容列表
-export function getcheckAllList(query) {
-  return request({
-    url: '/base/equipment-check/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建设备巡检计划记录
-export function createCheckLog(data) {
-  return request({
-    url: '/base/equipment-check-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新设备巡检计划记录
-export function updateCheckLog(data) {
-  return request({
-    url: '/base/equipment-check-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得设备巡检计划记录
-export function getEqCheckLog(id) {
-  return request({
-    url: '/base/equipment-check-log/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 导出设备巡检计划记录
-export function exportCheckLogExcel(query) {
-  return request({
-    url: '/base/equipment-check-log/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 导出设备巡检单记录
-export function exportCheckOrderExcel(query) {
-  return request({
-    url: '/base/equipment-check-order/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-
-// 根据设备获得所有巡检配置列表
-export function getcheckConfigByEqList(query) {
-  return request({
-    url: '/base/equipment-check-config/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除设备巡检记录
-export function deleteEqCheckLog(id) {
-  return request({
-    url: '/base/equipment-check-log/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得设备巡检单详情分页
-export function getCheckOrderDetPage(query) {
-  return request({
-    url: '/base/equipment-check-order-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建设备巡检单详情
-export function createCheckOrderDet(data) {
-  return request({
-    url: '/base/equipment-check-order-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新设备巡检单详情
-export function updateCheckOrderDet(data) {
-  return request({
-    url: '/base/equipment-check-order-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除设备巡检单详情
-export function deleteCheckOrderDet(id) {
-  return request({
-    url: '/base/equipment-check-order-det/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得设备巡检计划单
-export function getEqCheckOrder(id) {
-  return request({
-    url: '/base/equipment-check-order/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得设备巡检单分页
-export function getCheckOrderPage(query) {
-  return request({
-    url: '/base/equipment-check-order/page',
-    method: 'get',
-    params: query
-  })
-}

src/api/equipment/base/inspection/settings.js

@@ -1,162 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2024-02-25 22:23:54
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 获得设备巡检设置
-export function getEqCheck(id) {
-  return request({
-    url: '/base/equipment-check-config/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 创建巡检项目
-export function createCheckDet(data) {
-  return request({
-    url: '/base/equipment-check-config-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新巡检项目
-export function updateCheckDet(data) {
-  return request({
-    url: '/base/equipment-check-config-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除巡检项目
-export function deleteCheckDet(id) {
-  return request({
-    url: '/base/equipment-check-config-det/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-//巡检项目
-export function getCheckDet(id) {
-  return request({
-    url: '/base/equipment-check-config-det/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得巡检项目分页
-export function getCheckDetPage(query) {
-  return request({
-    url: '/base/equipment-check-config-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得设备巡检所有列表
-export function getcheckList(query) {
-  return request({
-    url: '/base/equipment-check/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除巡检内容
-export function deleteCheck(id) {
-  return request({
-    url: '/base/equipment-check/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得设备巡检设置code
-export function getCode() {
-  return request({
-    url: '/base/equipment-check-config/getCode',
-    method: 'get'
-  })
-}
-
-// 创建巡检配置
-export function createCheckConfig(data) {
-  return request({
-    url: '/base/equipment-check-config/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新巡检配置
-export function updateCheckConfig(data) {
-  return request({
-    url: '/base/equipment-check-config/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 创建巡检单
-export function createCheckOrder(data) {
-  return request({
-    url: '/base/equipment-check-order/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新巡检单
-export function updateCheckOrder(data) {
-  return request({
-    url: '/base/equipment-check-order/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得设备巡检单code
-export function getOrderCode() {
-  return request({
-    url: '/base/equipment-check-order/getCode',
-    method: 'get'
-  })
-}
-
-// 获得巡检单
-export function getCheckOrder(id) {
-  return request({
-    url: '/base/equipment-check-order/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得巡检单详细
-export function getCheckOrderDet(id) {
-  return request({
-    url: '/base/equipment-check-order-det/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 创建巡检单详情
-export function createCheckOrderDet(data) {
-  return request({
-    url: '/base/equipment-check-order-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新巡检单详情
-export function updateCheckOrderDet(data) {
-  return request({
-    url: '/base/equipment-check-order-det/update',
-    method: 'put',
-    data: data
-  })
-}

src/api/equipment/base/maintain/confirm.js

@@ -1,26 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2024-02-26 15:01:48
- * @LastEditTime: 2024-02-26 18:09:39
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 获得设备保养记录分页
-export function getLogDetPage(query) {
-  return request({
-    url: '/base/equipment-maintain-log-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得设备巡检单
-export function getCheckOrder(query) {
-  return request({
-    url: '/base/equipment-check-order/get',
-    method: 'get',
-    params: query
-  })
-}

src/api/equipment/base/maintain/items.js

@@ -1,61 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2024-07-12 15:31:41
- * @LastEditTime: 2024-07-30 16:44:47
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 删除设备保养记录
-export function deleteData(id) {
-  return request({
-    url: '/base/equipment-maintain-program/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-export function getItemPageData(data) {
-  return request({
-    url: '/base/equipment-maintain-program/page',
-    method: 'get',
-    params:data
-  })
-}
-
-export function getByEquId(id) {
-  return request({
-    url: '/base/equipment-maintain-program/getByEquId?id=' + id,
-    method: 'get',
-  })
-}
-
-export function getItemData(id) {
-  return request({
-    url: 'base/equipment-maintain-program/get?id=' + id,
-    method: 'get'
-  })
-}
-
-export function updateItemData(data) {
-  return request({
-    url: 'base/equipment-maintain-program/update',
-    method: 'put',
-    data
-  })
-}
-
-export function createItemData(data) {
-  return request({
-    url: 'base/equipment-maintain-program/create',
-    method: 'post',
-    data
-  })
-}
-
-export function deleteProgramTypeData(id) {
-  return request({
-    url: 'base/equipment-maintain-program-type/delete?id=' + id,
-    method: 'delete'
-  })
-}

src/api/equipment/base/maintain/logConfig.js

@@ -1,104 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2024-07-30 15:46:23
- * @LastEditTime: 2024-07-31 09:18:25
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 获得设备保养计划配置分页
-export function getLogPage(query) {
-  return request({
-    url: '/base/equipment-maintain-log/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建设备保养计划
-export function createLog(data) {
-  return request({
-    url: '/base/equipment-maintain-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新设备保养计划
-export function updateLog(data) {
-  return request({
-    url: '/base/equipment-maintain-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得计划code
-export function getCode() {
-  return request({
-    url: '/base/equipment-maintain-log/getCode',
-    method: 'get'
-  })
-}
-
-// 获得计划
-export function getLog(query) {
-  return request({
-    url: '/base/equipment-maintain-log/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得设备保养计划配置详情分页
-export function getLogDetPage(query) {
-  return request({
-    url: '/base/equipment-maintain-log-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建设备保养计划详情
-export function createLogDet(data) {
-  return request({
-    url: '/base/equipment-maintain-log-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新设备保养计划详情
-export function updateLogDet(data) {
-  return request({
-    url: '/base/equipment-maintain-log-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得计划详情
-export function getLogDet(query) {
-  return request({
-    url: '/base/equipment-maintain-log-det/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除设备保养计划
-export function deleteLog(id) {
-  return request({
-    url: '/base/equipment-maintain-log/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 删除设备保养计划详情
-export function deleteLogDet(id) {
-  return request({
-    url: '/base/equipment-maintain-log-det/delete?id=' + id,
-    method: 'delete'
-  })
-}

src/api/equipment/base/maintain/planconfig.js

@@ -1,104 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2024-02-22 15:14:19
- * @LastEditTime: 2024-02-23 19:18:22
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 获得设备保养计划配置分页
-export function getPlanPage(query) {
-  return request({
-    url: '/base/equipment-maintain-plan/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建设备保养计划
-export function createPlan(data) {
-  return request({
-    url: '/base/equipment-maintain-plan/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新设备保养计划
-export function updatePlan(data) {
-  return request({
-    url: '/base/equipment-maintain-plan/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得计划code
-export function getCode() {
-  return request({
-    url: '/base/equipment-maintain-plan/getCode',
-    method: 'get'
-  })
-}
-
-// 获得计划
-export function getPlan(query) {
-  return request({
-    url: '/base/equipment-maintain-plan/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得设备保养计划配置详情分页
-export function getPlanDetPage(query) {
-  return request({
-    url: '/base/equipment-maintain-plan-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建设备保养计划详情
-export function createPlanDet(data) {
-  return request({
-    url: '/base/equipment-maintain-plan-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新设备保养计划详情
-export function updatePlanDet(data) {
-  return request({
-    url: '/base/equipment-maintain-plan-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 获得计划详情
-export function getPlanDet(query) {
-  return request({
-    url: '/base/equipment-maintain-plan-det/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除设备保养计划
-export function deletePlan(id) {
-  return request({
-    url: '/base/equipment-maintain-plan/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 删除设备保养计划详情
-export function deletePlanDet(id) {
-  return request({
-    url: '/base/equipment-maintain-plan-det/delete?id=' + id,
-    method: 'delete'
-  })
-}

src/api/equipment/base/maintain/record.js

@@ -1,80 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2024-02-26 17:02:53
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 删除设备保养记录
-export function deleteEqMaintainLog(id) {
-  return request({
-    url: '/base/equipment-maintain-log/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 删除设备保养计划配置
-export function deleteEqMaintainPlan(id) {
-  return request({
-    url: '/base/equipment-maintain-plan/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 导出设备保养监控
-export function exportMaintainMonitorExcel(query) {
-  return request({
-    url: '/base/equipment-maintain-plan/monitor-export',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 导出设备保养记录
-export function exportMaintainLogExcel(query) {
-  return request({
-    url: '/base/equipment-maintain-log/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 导出巡检单
-export function exportCheckOrderExcel(query) {
-  return request({
-    url: '/base/equipment-check-order/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 获得保养记录
-export function getLog(query) {
-  return request({
-    url: '/base/equipment-maintain-log/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得设备保养记录详情分页
-export function getLogDetPage(query) {
-  return request({
-    url: '/base/equipment-maintain-log-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除设备保养记录详情
-export function deleteLogDet(id) {
-  return request({
-    url: '/base/equipment-maintain-log-det/delete?id=' + id,
-    method: 'delete'
-  })
-}

src/api/equipment/base/repair.js

@@ -1,43 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-10 16:09:33
- * @LastEditTime: 2023-11-23 20:29:28
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-//获得设备维修
-export function getEqRepair(id) {
-  return request({
-    url: '/base/equipment-repair-log/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 更新设备维修记录
-export function updateEqRepair(data) {
-  return request({
-    url: '/base/equipment-repair-log/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除维修记录
-export function deleteRepair(id) {
-  return request({
-    url: '/base/equipment-repair-log/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 导出设备维修
-export function exportRepairLogExcel(query) {
-  return request({
-    url: '/base/equipment-repair-log/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/equipment/base/spare-parts/config.js

@@ -1,68 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-11 16:18:57
- * @LastEditTime: 2023-11-16 20:52:06
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-//获得备品备件配置
-export function getSparePartConfig(id) {
-  return request({
-    url: '/base/equipment-spare-part-config/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 创建设备备品备件配置--抽屉
-export function createConfigDet(data) {
-  return request({
-    url: '/base/equipment-spare-part-config-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除设备备品备件配置--抽屉
-export function deleteConfigDet(id) {
-  return request({
-    url: '/base/equipment-spare-part-config-det/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得抽屉表格分页
-export function getConfigDetPage(query) {
-  return request({
-    url: '/base/equipment-spare-part-config-det/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得备品备件列表
-export function getSparePartList(query) {
-  return request({
-    url: '/base/equipment-spare-part/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除设备备品备件配置
-export function deleteConfig(id) {
-  return request({
-    url: '/base/equipment-spare-part-config/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得备品备件分页
-export function getSparePartPage(query) {
-  return request({
-    url: '/base/equipment-spare-part/page',
-    method: 'get',
-    params: query
-  })
-}

src/api/equipment/base/spare-parts/list.js

@@ -1,16 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-22 13:59:17
- * @LastEditTime: 2023-11-22 13:59:45
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 删除设备备品备件
-export function deleteSparePart(id) {
-  return request({
-    url: '/base/equipment-spare-part/delete?id=' + id,
-    method: 'delete'
-  })
-}

src/api/equipment/base/spare-parts/monitor.js

@@ -1,45 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-11-11 16:18:57
- * @LastEditTime: 2023-11-11 18:44:51
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 获得抽屉表格分页
-export function getConfigDetMonitorPage(query) {
-  return request({
-    url: '/base/equipment-spare-part-config-det/monitor',
-    method: 'get',
-    params: query
-  })
-}
-
-// 创建设备备品备件更换log
-export function createSparePartLog(data) {
-  return request({
-    url: '/base/equipment-spare-part-log/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得设备备品备件更换log分页
-export function getSparePartLogPage(query) {
-  return request({
-    url: '/base/equipment-spare-part-log/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出设备备品备件更换log
-export function exportSparePartLogExcel(query) {
-  return request({
-    url: '/base/equipment-spare-part-log/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/extend/processEquMaterialBom.js

@@ -1,121 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-11-07 19:47:48
- * @LastEditTime: 2024-07-08 14:33:12
- * @LastEditors: zwq
- * @Description:
- */
-import request from '@/utils/request'
-
-// 获得能耗统计查询分页
-export function processEquMaterialBomPage(data) {
-  return request({
-    url: '/extend/process-equ-material-bom/page',
-    method: 'get',
-    params: data
-  })
-}
-
-export function updateProcessEquMaterialBom(data) {
-  return request({
-    url: '/extend/process-equ-material-bom/update',
-    method: 'put',
-    data: data
-  })
-}
-
-export function createProcessEquMaterialBom(data) {
-  return request({
-    url: '/extend/process-equ-material-bom/create',
-    method: 'post',
-    data: data
-  })
-}
-
-
-export function getProcessEquMaterialBom(data) {
-  return request({
-    url: '/extend/process-equ-material-bom/get',
-    method: 'get',
-    params: data
-  })
-}
-
-export function deleteProcessEquMaterialBom(id) {
-  return request({
-    url: '/extend/process-equ-material-bom/delete?id=' + id,
-    method: 'delete',
-    // data: data
-  })
-}
-
-export function getEquipmentList(data) {
-  return request({
-    url: '/base/core-equipment/listAll',
-    method: 'get',
-    data: data
-  })
-}
-
-export function deleteProcessEquMaterialBomDet(id) {
-  return request({
-    url: '/extend/process-equ-material-bom-det/delete?id=' + id,
-    method: 'delete',
-    // data: data
-  })
-}
-
-export function processEquMaterialBomDetPage(data) {
-  return request({
-    url: '/extend/process-equ-material-bom-det/page',
-    method: 'get',
-    params: data
-  })
-}
-
-export function updateProcessEquMaterialBomDet(data) {
-  return request({
-    url: '/extend/process-equ-material-bom-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-export function createProcessEquMaterialBomDet(data) {
-  return request({
-    url: '/extend/process-equ-material-bom-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-export function getProcessEquMaterialBomDet(data) {
-  return request({
-    url: '/extend/process-equ-material-bom-det/get',
-    method: 'get',
-    params: data
-  })
-}
-
-export function getMaterialList(data) {
-  return request({
-    url: '/base/core-product-material/listAll',
-    method: 'get',
-    data: data
-  })
-}
-export function getMaterialCode(data) {
-  return request({
-    url: '/extend/process-equ-material-bom/getCode',
-    method: 'get',
-    params: data
-  })
-}
-
-export function createProcessEquMaterialBomDetList(data) {
-  return request({
-    url: '/extend/process-equ-material-bom-det/createByList',
-    method: 'post',
-    data: data
-  })
-}

src/api/extend/processEquValueBom.js

@@ -1,122 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-11-09 09:37:14
- * @LastEditTime: 2023-11-23 14:15:45
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-
-export function processEquValueBomPage(data) {
-  return request({
-    url: '/extend/process-equ-value-bom/page',
-    method: 'get',
-    params: data
-  })
-}
-
-export function updateProcessEquValueBom(data) {
-  return request({
-    url: '/extend/process-equ-value-bom/update',
-    method: 'put',
-    data: data
-  })
-}
-
-export function createProcessEquValueBom(data) {
-  return request({
-    url: '/extend/process-equ-value-bom/create',
-    method: 'post',
-    data: data
-  })
-}
-
-
-export function getProcessEquValueBom(data) {
-  return request({
-    url: '/extend/process-equ-value-bom/get',
-    method: 'get',
-    params: data
-  })
-}
-
-export function deleteProcessEquValueBom(id) {
-  return request({
-    url: '/extend/process-equ-value-bom/delete?id=' + id,
-    method: 'delete',
-    // data: data
-  })
-}
-
-export function getEquipmentList(data) {
-  return request({
-    url: '/base/core-equipment/listAll',
-    method: 'get',
-    data: data
-  })
-}
-
-export function deleteProcessEquValueBomDet(id) {
-  return request({
-    url: '/extend/process-equ-value-bom-det/delete?id=' + id,
-    method: 'delete',
-    // data: data
-  })
-}
-
-export function processEquValueBomDetPage(data) {
-  return request({
-    url: '/extend/process-equ-value-bom-det/page',
-    method: 'get',
-    params: data
-  })
-}
-
-export function updateProcessEquValueBomDet(data) {
-  return request({
-    url: '/extend/process-equ-value-bom-det/update',
-    method: 'put',
-    data: data
-  })
-}
-
-export function createProcessEquValueBomDet(data) {
-  return request({
-    url: '/extend/process-equ-value-bom-det/create',
-    method: 'post',
-    data: data
-  })
-}
-
-export function getProcessEquValueBomDet(data) {
-  return request({
-    url: '/extend/process-equ-value-bom-det/get',
-    method: 'get',
-    params: data
-  })
-}
-
-export function getValueList(data) {
-  return request({
-    url: '/extend/process-equ-value-bom-det/getEnableValuesByEquId',
-    method: 'get',
-    params: data
-  })
-}
-
-export function getValueCode(data) {
-  return request({
-    url: '/extend/process-equ-value-bom/getCode',
-    method: 'get',
-    params: data
-  })
-}
-
-export function createProcessEquValueBomDetList(data) {
-  return request({
-    url: '/extend/process-equ-value-bom-det/createByList',
-    method: 'post',
-    data: data
-  })
-}

src/api/home.js

@@ -1,54 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2024-09-12 13:38:33
- * @LastEditors: zwq
- * @LastEditTime: 2024-09-13 15:25:07
- * @Description:
- */
-import request from '@/utils/request'
-// 获得首页生产总览以及工单监控
-export function getHomeOrder(data) {
-  return request({
-    url: '/base/core-work-order/homeOrder',
-    method: 'post',
-    data: data
-  })
-}
-// 获得首页生产总览-完成订单数量
-export function getHomeOrderNum(data) {
-  return request({
-    url: '/base/order/homeOrder',
-    method: 'post',
-    data: data
-  })
-}
-// 首页设备总览
-export function getHomeEquipment() {
-  return request({
-    url: '/monitoring/equipment-monitor/homeEquipment',
-    method: 'get'
-  })
-}
-
-// 首页设备报警信息
-export function getHomeEquipmentAlarmList() {
-  return request({
-    url: '/base/equipment-alarm-realtime/homeEquipmentAlarmList',
-    method: 'get'
-  })
-}
-// 获取是否存在报警（右上角红点）
-export function getHomeGetAlarm() {
-  return request({
-    url: '/base/core-alarm-log/homeGetAlarm',
-    method: 'get'
-  })
-}
-// 条件查询获得异常警告列表
-export function getHomeAlarmList(query) {
-  return request({
-    url: '/base/core-alarm-log/listbyfilter',
-    method: 'get',
-    params: query
-  })
-}

src/api/material/issue.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+// 获得工厂分页
+export function getMaterialReceiptIssuePageData(data) {
+	return request({
+		url: '/base/material-warehouse-his/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+
+export function createMaterialIssue(data) {
+	return request({
+		url: '/base/material-warehouse-his/create',
+		method: 'post',
+		data: data,
+	});
+}

src/api/monitoring/energyOverlimitLog.js

@@ -43,6 +43,14 @@ export function getEnergyOverlimitLogPage(data) {
   })
 }
 
+// 获得手动抄表记录分页
+export function getEnergyManualLogPage(data) {
+  return request({
+    url: '/monitoring/energy-overlimit-log/pageManual',
+    method: 'post',
+    data: data
+  })
+}
 // 导出能源超限记录 Excel
 export function exportEnergyOverlimitLogExcel(query) {
   return request({

src/api/monitoring/groupTeamView.js

@@ -1,27 +0,0 @@
-import request from '@/utils/request'
-// 执行班组追溯 根据工单
-export function getByWorkOrder(query) {
-  return request({
-    url: '/monitoring/schedulingmonitoring/getByWorkOrder',
-    method: 'get',
-    params: query
-  })
-}
-
-// 执行班组追溯详情 根据工单班组
-export function getByTeam(query) {
-  return request({
-    url: '/monitoring/schedulingmonitoring/getByTeam',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取某次排班的生产情况详情
-export function getByScheduling(query) {
-  return request({
-    url: '/monitoring/schedulingmonitoring/getByScheduling',
-    method: 'get',
-    params: query
-  })
-}

src/api/monitoring/orderEnergy.js

@@ -1,19 +0,0 @@
-import request from '@/utils/request'
-// 获取工单信息
-export function getWorkOrderMsg(data) {
-  return request({
-    url: '/monitoring/energy-work-order/getWorkOrderMsg',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取工单能源消耗数据
-export function getOrderEnergyData(data) {
-  return request({
-    url: '/monitoring/energy-work-order/getData',
-    method: 'post',
-    data: data
-  })
-}
-

src/api/monitoring/qualityInspectionRecord.js

@@ -1,16 +1,9 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-17 09:26:38
- * @LastEditTime: 2023-11-02 17:00:17
- * @LastEditors: zhp
- * @Description:
- */
 import request from '@/utils/request'
 
 // 创建质量检查信息记录表
 export function createQualityInspectionRecord(data) {
   return request({
-    url: '/base/quality-inspection-record/create',
+    url: '/monitoring/quality-inspection-record/create',
     method: 'post',
     data: data
   })
@@ -19,7 +12,7 @@ export function createQualityInspectionRecord(data) {
 // 更新质量检查信息记录表
 export function updateQualityInspectionRecord(data) {
   return request({
-    url: '/base/quality-inspection-record/update',
+    url: '/monitoring/quality-inspection-record/update',
     method: 'put',
     data: data
   })
@@ -28,7 +21,7 @@ export function updateQualityInspectionRecord(data) {
 // 删除质量检查信息记录表
 export function deleteQualityInspectionRecord(id) {
   return request({
-    url: '/base/quality-inspection-record/delete?id=' + id,
+    url: '/monitoring/quality-inspection-record/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -36,7 +29,7 @@ export function deleteQualityInspectionRecord(id) {
 // 获得质量检查信息记录表
 export function getQualityInspectionRecord(id) {
   return request({
-    url: '/base/quality-inspection-record/get?id=' + id,
+    url: '/monitoring/quality-inspection-record/get?id=' + id,
     method: 'get'
   })
 }
@@ -44,7 +37,7 @@ export function getQualityInspectionRecord(id) {
 // 获得质量检查信息记录表分页
 export function getQualityInspectionRecordPage(query) {
   return request({
-    url: '/base/quality-inspection-record/page',
+    url: '/monitoring/quality-inspection-record/page',
     method: 'get',
     params: query
   })
@@ -53,7 +46,7 @@ export function getQualityInspectionRecordPage(query) {
 // 导出质量检查信息记录表 Excel
 export function exportQualityInspectionRecordExcel(query) {
   return request({
-    url: '/base/quality-inspection-record/export-excel',
+    url: '/monitoring/quality-inspection-record/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/monitoring/statisticalData.js

@@ -1,48 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-11-07 14:10:18
- * @LastEditTime: 2023-11-16 17:49:52
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-// 获得质量检查信息记录表分页
-export function getStatisticalDataPage(query) {
-  return request({
-    url: '/base/statistical-data/getStatisticData',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getWorkOrderList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}
-export function getProductList(query) {
-  return request({
-    url: '/base/core-product-material/listAll',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function getInspectionData(query) {
-  return request({
-    url: '/base/statistical-data/getInspectionData',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function getRecordInOneDay(query) {
-  return request({
-    url: '/analysis/record-in-one-day/get',
-    method: 'get',
-    params: query,
-  })
-}

src/api/monitoring/teamProduction.js

@@ -1,28 +0,0 @@
-import request from '@/utils/request'
-
-// 获得排班信息分页 建议size 150
-export function groupTeamSchedulingPage(query) {
-  return request({
-    url: '/base/group-team-scheduling/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得不同产线每小时报废数据，用于班组检测 班组生产情况详情（动态结构）
-export function getSchedulingMonitoringRecord(query) {
-  return request({
-    url: '/base/quality-inspection-record/getSchedulingMonitoringRecord',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function groupClassesListAll(query) {
-  return request({
-    url: '/base/group-classes/listAll',
-    method: 'get',
-    params: query
-  })
-}

src/api/order/index.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+export function getOrderPage(data) {
+	return request({
+		url: '/base/core-work-order/page',
+		method: 'post',
+		data: data,
+	});
+}
+
+export function updateOrderData(data) {
+	return request({
+		url: '/base/core-work-order/updatee',
+		method: 'put',
+		data: data,
+	});
+}
+
+export function createOrderData(data) {
+	return request({
+		url: '/base/core-work-order/create',
+		method: 'post',
+		data: data,
+	});
+}
+export function getOrderData(id) {
+  return request({
+		url: '/base/core-work-order/get?id=' + id,
+		method: 'get',
+	});
+}
+export function getOrderCode(data) {
+	return request({
+		url: '/base/core-work-order/getCode',
+		method: 'get',
+		data: data,
+	});
+}
+
+export function deleteOrder(id) {
+  return request({
+    url: '/base/core-work-order/delete?id=' + id,
+    method: 'delete'
+  })
+}

src/api/quality/deviceParameters.js

@@ -1,35 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-18 09:33:57
- * @LastEditTime: 2023-11-03 09:31:17
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-
-// 获得物料信息追溯page
-export function getTreeData(query) {
-  return request({
-    url: '/base/core-factory/getTreeByWorkOrder',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getWorkOrderList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}
-// 导出物料信息
-export function exportEnergyPlcExcel(query) {
-  return request({
-    url: '/base/material-use-log/materialTraceExport',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/quality/materialTraceability.js

@@ -1,35 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-18 09:33:57
- * @LastEditTime: 2023-10-31 10:28:51
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-
-// 获得物料信息追溯page
-export function getMaterialUseLogPage(query) {
-  return request({
-    url: '/base/material-use-log/materialTrace',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getWorkOrderList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}
-// 导出物料信息
-export function exportEnergyPlcExcel(query) {
-  return request({
-    url: '/base/material-use-log/materialTraceExport',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/quality/processTraceability.js

@@ -1,43 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-31 15:05:06
- * @LastEditTime: 2023-11-28 09:28:05
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-
-// 获得工艺信息追溯page
-export function getProcessTraceabilityPage(query) {
-  return request({
-    url: '/extend/process-retrospect/get',
-    method: 'post',
-    data: query
-  })
-}
-
-export function getWorkOrderList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function getCoreProduct(id) {
-  return request({
-    url: '/base/core-product/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 导出物料信息
-// export function exportEnergyPlcExcel(query) {
-//   return request({
-//     url: '/base/material-use-log/materialTraceExport',
-//     method: 'get',
-//     params: query,
-//     responseType: 'blob'
-//   })
-// }

src/api/quality/processTraceabilityDetail.js

@@ -1,43 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-18 09:33:57
- * @LastEditTime: 2023-11-09 15:33:20
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-
-// 获得物料信息追溯page
-export function getDetMaterial(query) {
-  return request({
-    url: '/extend/process-retrospect/getDetMaterial',
-    method: 'post',
-    data: query
-  })
-}
-
-export function getDetValue(query) {
-  return request({
-    url: '/extend/process-retrospect/getDetValue',
-    method: 'post',
-    data: query
-  })
-}
-
-// export function getWorkOrderList(query) {
-//   return request({
-//     url: '/base/core-work-order/listbyfilter',
-//     method: 'get',
-//     params: query,
-//   })
-// }
-// // 导出物料信息
-// export function exportEnergyPlcExcel(query) {
-//   return request({
-//     url: '/base/material-use-log/materialTraceExport',
-//     method: 'get',
-//     params: query,
-//     responseType: 'blob'
-//   })
-// }

src/api/quality/rawMaterialTraceability.js

@@ -1,35 +0,0 @@
-/*
- * @Author: zhp
- * @Date: 2023-10-31 10:55:20
- * @LastEditTime: 2023-10-31 15:05:30
- * @LastEditors: zhp
- * @Description:
- */
-import request from '@/utils/request'
-
-
-// 获得原料信息追溯page
-export function getRawMaterialPage(query) {
-  return request({
-    url: '/base/core-work-order-material/page',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getWorkOrderList(query) {
-  return request({
-    url: '/base/core-work-order/listbyfilter',
-    method: 'get',
-    params: query,
-  })
-}
-// 导出物料信息
-export function exportEnergyPlcExcel(query) {
-  return request({
-    url: '/base/material-use-log/materialTraceExport',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}