xiugai

Reviewed-on: #399

.env.dev

@@ -1,26 +1,19 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-06 09:08:54
- # @LastEditors: DY
+ # @LastEditTime: 2024-11-25 14:31:39
+ # @LastEditors: zwq
  # @Description:
 ###
 # 开发环境配置
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = MES系统
+VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-VUE_APP_BASE_API = 'http://192.168.4.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.188:48080'
-# VUE_APP_BASE_API = 'http://192.168.2.159:48080'
+# VUE_APP_BASE_API = 'http://192.168.8.22:48080'
+VUE_APP_BASE_API = 'http://172.16.32.79:48082'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod

@@ -1,15 +1,24 @@
+###
+ # @Author: zwq
+ # @Date: 2024-03-27 15:49:55
+ # @LastEditors: zwq
+ # @LastEditTime: 2024-10-30 11:08:47
+ # @Description:
+###
 # 生产环境配置
 ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = ''
 
 # 根据服务器或域名修改
 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
-PUBLIC_PATH = 'http://192.168.0.33:8888/'
+# PUBLIC_PATH = 'http://192.168.0.33:8888/'
+PUBLIC_PATH = ''
 
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'

package.json

@@ -6,9 +6,9 @@
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
-    "dev": "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,7 +41,6 @@
     "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",
@@ -71,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/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,68 +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
-  })
-}

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: 2023-11-04 10:42:50
- * @LastEditors: DY
- * @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/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,111 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-06 10:50:57
- * @LastEditors: DY
- * @Description: 
- */
-import request from '@/utils/request'
-
-// 创建工单
-export function createCoreWO(data) {
-  return request({
-    url: '/base/core-work-order/create',
-    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
-  })
-}
-
-// 创建工单预使用原料
-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
-  })
-}

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,73 +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 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
-  })
-}

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/groupClasses.js

@@ -51,6 +51,13 @@ export function getCode() {
   })
 }
 
+// 获得可用的班次列表
+export function listClassesEnabled() {
+  return request({
+    url: '/base/group-classes/listEnable',
+    method: 'get'
+  })
+}
 // 导出班次基础信息 Excel
 export function exportGroupClassesExcel(query) {
   return request({

src/api/base/groupSchedulingPlan.js

@@ -0,0 +1,125 @@
+import request from '@/utils/request'
+
+// 创建排班计划配置基础信息
+export function createGroupPlan(data) {
+  return request({
+    url: '/base/group-scheduling-plan/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新排班计划配置基础信息
+export function updateGroupPlan(data) {
+  return request({
+    url: '/base/group-scheduling-plan/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除排班计划配置基础信息
+export function deleteGroupPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得排班计划配置基础信息
+export function getGroupPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得排班计划配置基础信息分页
+export function getGroupPlanPage(query) {
+  return request({
+    url: '/base/group-scheduling-plan/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得所有排班计划列表
+export function groupPlanList() {
+  return request({
+    url: '/base/group-scheduling-plan/listAll',
+    method: 'get'
+  })
+}
+// 获得排班计划相关班组列表
+export function groupPlanTeamList(id) {
+  return request({
+    url: '/base/group-scheduling-plan-team/teamListByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+// 获得排班计划相关班次列表
+export function groupPlanClassesList(id) {
+  return request({
+    url: '/base/group-scheduling-plan-classes/classesListByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+// 获取code
+export function getCode() {
+  return request({
+    url: '/base/group-scheduling-plan/getCode',
+    method: 'get'
+  })
+}
+
+// 导出排班计划配置基础信息 Excel
+export function exportGroupPlanExcel(query) {
+  return request({
+    url: '/base/group-scheduling-plan/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获得产线工段树形结构
+export function getGroupPlanTree() {
+  return request({
+    url: '/base/group-scheduling-plan/getLineSectionTree',
+    method: 'get'
+  })
+}
+
+// 创建排班计划产线工段
+export function createGroupPlanLine(data) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/createPlanLineSection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新排班计划产线工段
+export function updateGroupPlanLine(data) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/updatePlanLineSection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得排班计划配置基础信息
+export function getGroupPlanLine(id) {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/getLineSectionByPlanId?planId=' + id,
+    method: 'get'
+  })
+}
+
+// 获得当前登录用户所在部门id
+export function getLoginUserDeptId() {
+  return request({
+    url: '/base/group-scheduling-plan-line-section/getLoginUserDeptId',
+    method: 'get'
+  })
+}

src/api/base/groupSchedulingRule.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 创建排班规则基础信息
+export function createGroupRule(data) {
+  return request({
+    url: '/base/group-scheduling-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+// 作废排班规则
+export function disableGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/disable?id=' + id,
+    method: 'post',
+  })
+}
+// 更新排班规则基础信息
+export function updateGroupRule(data) {
+  return request({
+    url: '/base/group-scheduling-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除排班规则基础信息
+export function deleteGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得排班规则基础信息
+export function getGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得排班规则基础信息分页
+export function getGroupRulePage(query) {
+  return request({
+    url: '/base/group-scheduling-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出排班规则基础信息 Excel
+export function exportGroupRuleExcel(query) {
+  return request({
+    url: '/base/group-scheduling-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/base/groupTeamScheduling.js

@@ -8,7 +8,14 @@ export function getPreset(query) {
     params: query
   })
 }
-
+// 获取某月预排班
+export function getScheduling(query) {
+  return request({
+    url: '/base/group-team-scheduling/getScheduling',
+    method: 'get',
+    params: query
+  })
+}
 // 批量创建-更新排班信息
 export function createOrUpdateList(data) {
   return request({
@@ -26,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
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-24 11:22:28
- * @LastEditors: DY
- * @Description: 
+ * @Author: zwq
+ * @Date: 2024-04-09 16:42:19
+ * @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,65 +56,20 @@ export function getMaterialPage(query) {
     params: query
   })
 }
-
-// 获得物料列表
-export function getMaterialList(query) {
+// 获得原料列表
+export function getMaterialList() {
   return request({
-    url: '/base/material/listbyfilter',
+    url: '/base/material/list',
     method: 'get',
-    params: query
   })
 }
 
-// 获得供应商所有列表
-export function getSupplierList(query) {
+// 导出原料 Excel
+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
-  })
-}

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,112 +0,0 @@
-/*
- * @Author: Do not edit
- * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-26 20:06:29
- * @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/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'
-  })
-}

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/orderManage.js

@@ -1,140 +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 getProcessFlowList() {
-  return request({
-    url: '/extend/process-flow/listAll',
-    method: 'get'
-  })
-}
-
-// 创建订单
-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
-  })
-}
-
-// 获得所有客户列表
-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
-  })
-}

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,8 +0,0 @@
-import request from '@/utils/request'
-// 获得产品列表
-export function getProductAll() {
-  return request({
-    url: '/base/core-product/listAll',
-    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/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,8 +1,8 @@
 /*
  * @Author: zhp
  * @Date: 2023-09-12 14:07:04
- * @LastEditTime: 2023-09-13 09:53:45
- * @LastEditors: zhp
+ * @LastEditTime: 2025-01-08 15:47:17
+ * @LastEditors: zwq
  * @Description:
  */
 import request from '@/utils/request'
@@ -22,3 +22,26 @@ export function getCT(data) {
     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',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得所有列表
-export function getFactoryList(query) {
-  return request({
-    url: '/base/core-factory/listAll',
+    url: '/base/factory/page',
     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
- * @LastEditors: DY
- * @Description: 
+ * @LastEditTime: 2025-01-07 09:57:36
+ * @LastEditors: zwq
+ * @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
- * @LastEditors: DY
- * @Description: 
+ * @LastEditTime: 2025-03-03 10:43:34
+ * @LastEditors: zwq
+ * @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/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/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/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/warehouse/warehouse-info.js

@@ -1,75 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2023-11-02 14:21:18
- * @LastEditors: zwq
- * @LastEditTime: 2023-11-02 14:34:29
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建仓库
-export function createWarehouse(data) {
-  return request({
-    url: '/extend/warehouse/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新仓库
-export function updateWarehouse(data) {
-  return request({
-    url: '/extend/warehouse/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除仓库
-export function deleteWarehouse(id) {
-  return request({
-    url: '/extend/warehouse/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得仓库
-export function getWarehouse(id) {
-  return request({
-    url: '/extend/warehouse/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得仓库列表
-export function getWarehouseList() {
-  return request({
-    url: '/extend/warehouse/listAll',
-    method: 'get'
-  })
-}
-// 获得仓库code
-export function getCode() {
-  return request({
-    url: '/extend/warehouse/getCode',
-    method: 'get'
-  })
-}
-// 获得仓库分页
-export function getWarehousePage(query) {
-  return request({
-    url: '/extend/warehouse/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出仓库 Excel
-export function exportWarehouseExcel(query) {
-  return request({
-    url: '/extend/warehouse/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/warehouse/warehouseGoods.js

@@ -1,76 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2023-11-02 16:20:15
- * @LastEditors: zwq
- * @LastEditTime: 2023-11-03 15:26:05
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建物品
-export function createWarehouseGoods(data) {
-  return request({
-    url: '/extend/warehouse-goods/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新物品
-export function updateWarehouseGoods(data) {
-  return request({
-    url: '/extend/warehouse-goods/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除物品
-export function deleteWarehouseGoods(id) {
-  return request({
-    url: '/extend/warehouse-goods/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得物品
-export function getWarehouseGoods(id) {
-  return request({
-    url: '/extend/warehouse-goods/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得物品列表
-export function getListByType(id) {
-  return request({
-    url: '/extend/warehouse-goods/getListByType?type=' + id,
-    method: 'get'
-  })
-}
-
-// 获得物品分页
-export function getWarehouseGoodsPage(data) {
-  return request({
-    url: '/extend/warehouse-goods/page',
-    method: 'POST',
-    data: data
-  })
-}
-
-// 获得code
-export function getCode() {
-  return request({
-    url: '/extend/warehouse-goods/getCode',
-    method: 'get'
-  })
-}
-// 导出物品 Excel
-export function exportWarehouseGoodsExcel(query) {
-  return request({
-    url: '/extend/warehouse-goods/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/warehouse/warehouseLocation.js

@@ -1,97 +0,0 @@
-/*
- * @Author: zwq
- * @Date: 2023-11-02 14:31:42
- * @LastEditors: zwq
- * @LastEditTime: 2023-11-04 14:56:10
- * @Description:
- */
-import request from '@/utils/request'
-
-// 创建库位
-export function createWarehouseLocation(data) {
-  return request({
-    url: '/extend/warehouse-location/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新库位
-export function updateWarehouseLocation(data) {
-  return request({
-    url: '/extend/warehouse-location/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除库位
-export function deleteWarehouseLocation(id) {
-  return request({
-    url: '/extend/warehouse-location/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得库位
-export function getWarehouseLocation(id) {
-  return request({
-    url: '/extend/warehouse-location/get?id=' + id,
-    method: 'get'
-  })
-}
-// 获得库位列表(通过仓库id)
-export function listByWarehouse(id) {
-  return request({
-    url: '/extend/warehouse-location/listByWarehouse?warehouseId=' + id,
-    method: 'get'
-  })
-}
-// 获得库位列表(All)
-export function listAll() {
-  return request({
-    url: '/extend/warehouse-location/listAll',
-    method: 'get'
-  })
-}
-// 获得库位code
-export function getCode() {
-  return request({
-    url: '/extend/warehouse-location/getCode',
-    method: 'get'
-  })
-}
-// 获得库位分页
-export function getWarehouseLocationPage(data) {
-  return request({
-    url: '/extend/warehouse-location/page',
-    method: 'POST',
-    data: data
-  })
-}
-// 获得库存总览数据
-export function getOverview(data) {
-  return request({
-    url: '/extend/warehouse-monitoring/getOverview',
-    method: 'POST',
-    data: data
-  })
-}
-// 获得库位占用率数据
-export function getRate(data) {
-  return request({
-    url: '/extend/warehouse-monitoring/getRate',
-    method: 'POST',
-    data: data
-  })
-}
-
-// 导出库位 Excel
-export function exportWarehouseLocationExcel(query) {
-  return request({
-    url: '/extend/warehouse-location/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/warehouse/warehouseRealtime.js

@@ -1,83 +0,0 @@
-import request from '@/utils/request'
-
-// 创建出入库-无库位-入库
-export function createWarehouseRealtime(data) {
-  return request({
-    url: '/extend/warehouse-realtime/create',
-    method: 'post',
-    data: data
-  })
-}
-// 创建出入库-无库位-出库
-export function outWarehouseRealtime(data) {
-  return request({
-    url: '/extend/warehouse-realtime/out',
-    method: 'post',
-    data: data
-  })
-}
-// 更新出入库-无库位
-export function updateWarehouseRealtime(data) {
-  return request({
-    url: '/extend/warehouse-realtime/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除出入库-无库位
-export function deleteWarehouseRealtime(id) {
-  return request({
-    url: '/extend/warehouse-realtime/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得出入库-无库位
-export function getWarehouseRealtime(id) {
-  return request({
-    url: '/extend/warehouse-realtime/get?id=' + id,
-    method: 'get'
-  })
-}
-// 获得出入库-无库位-展开详情
-export function getWarehouseRealtimeDet(id) {
-  return request({
-    url: '/extend/warehouse-realtime/getDet?id=' + id,
-    method: 'get'
-  })
-}
-// 获得出入库-无库位-批次列表
-export function getBatchList(id) {
-  return request({
-    url: '/extend/warehouse-realtime/getBatchList?id=' + id,
-    method: 'get'
-  })
-}
-// 获得出入库-无库位分页
-export function getWarehouseRealtimePage(data) {
-  return request({
-    url: '/extend/warehouse-realtime/page',
-    method: 'post',
-    data: data
-  })
-}
-
-// 获得出入库-无库位-历史分页
-export function getWarehouseRealtimeHisPage(data) {
-  return request({
-    url: '/extend/warehouse-his/page',
-    method: 'post',
-    data: data
-  })
-}
-
-// 导出出入库-无库位 Excel
-export function exportWarehouseRealtimeExcel(query) {
-  return request({
-    url: '/extend/warehouse-realtime/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/warehouse/warehouseRealtimeLocation.js

@@ -1,85 +0,0 @@
-import request from '@/utils/request'
-
-// 创建出入库-有库位
-export function createWarehouseRealtimeLocation(data) {
-  return request({
-    url: '/extend/warehouse-realtime-location/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新出入库-有库位
-export function updateWarehouseRealtimeLocation(data) {
-  return request({
-    url: '/extend/warehouse-realtime-location/update',
-    method: 'put',
-    data: data
-  })
-}
-// 出入库-有库位 > 出库操作
-export function outWarehouseRealtimeLocation(data) {
-  return request({
-    url: '/extend/warehouse-realtime-location/out',
-    method: 'post',
-    data: data
-  })
-}
-
-// 出入库-有库位 > 入库操作
-export function inWarehouseRealtimeLocation(data) {
-  return request({
-    url: '/extend/warehouse-realtime-location/in',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除出入库-有库位
-export function deleteWarehouseRealtimeLocation(id) {
-  return request({
-    url: '/extend/warehouse-realtime-location/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得出入库-有库位
-export function getWarehouseRealtimeLocation(id) {
-  return request({
-    url: '/extend/warehouse-realtime-location/get?id=' + id,
-    method: 'get'
-  })
-}
-// 获得出入库历史-有库位详情列表
-export function getWarehouseLocationHisDet(id) {
-  return request({
-    url: '/extend/warehouse-location-his-det/list?hisId=' + id,
-    method: 'get'
-  })
-}
-// 获得出入库-有库位分页
-export function getWarehouseRealtimeLocationPage(data) {
-  return request({
-    url: '/extend/warehouse-realtime-location/page',
-    method: 'post',
-    data: data
-  })
-}
-// 获得出入库历史-有库位分页
-export function getWarehouseLocationHisPage(data) {
-  return request({
-    url: '/extend/warehouse-location-his/page',
-    method: 'post',
-    data: data
-  })
-}
-
-// 导出出入库-有库位 Excel
-export function exportWarehouseRealtimeLocationExcel(query) {
-  return request({
-    url: '/extend/warehouse-realtime-location/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/assets/icons/svg/table_add.svg

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <desc>Created with Sketch.</desc>
-    <g id="11_系统管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="11-1用户管理" transform="translate(-1764.000000, -160.000000)">
-            <g id="编组-15" transform="translate(1763.000000, 158.000000)">
-                <g id="编组-18">
-                    <g id="icon/界面内/新增" transform="translate(0.000000, 1.000000)">
-                        <g id="编组">
-                            <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="11" height="11"></rect>
-                            <path d="M10.0813953,6.42885117 L6.37790698,6.42885117 L6.37790698,10.0770235 C6.37790698,10.3108355 6.19069767,10.5 5.95930233,10.5 L5.95930233,10.5 C5.72790698,10.5 5.54069767,10.3108355 5.54069767,10.0770235 L5.54069767,6.42885117 L1.91860465,6.42885117 C1.6872093,6.42885117 1.5,6.23968668 1.5,6.00587467 L1.5,6.00587467 C1.5,5.77206266 1.6872093,5.58289817 1.91860465,5.58289817 L5.54069767,5.58289817 L5.54069767,1.9229765 C5.54069767,1.68916449 5.72790698,1.5 5.95930233,1.5 L5.95930233,1.5 C6.19069767,1.5 6.37790698,1.68916449 6.37790698,1.9229765 L6.37790698,5.58289817 L10.0813953,5.58289817 C10.3127907,5.58289817 10.5,5.77206266 10.5,6.00587467 L10.5,6.00587467 C10.5,6.23968668 10.3127907,6.42885117 10.0813953,6.42885117 L10.0813953,6.42885117 Z" id="Shape" fill="#0B58FF" transform="translate(6.000000, 6.000000) scale(1, -1) translate(-6.000000, -6.000000) "></path>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/icons/svg/table_delete.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <desc>Created with Sketch.</desc>
-    <g id="11_系统管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="11-1用户管理" transform="translate(-1822.000000, -159.000000)" fill="#FF5454" fill-rule="nonzero">
-            <g id="编组-10" transform="translate(1821.000000, 158.000000)">
-                <g id="删除">
-                    <rect id="矩形" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                    <path d="M9.39137788,11.7149165 C9.13431614,11.7149165 8.92716929,11.5077697 8.92716929,11.2507079 L8.92716929,6.14191781 C8.92716929,5.88485607 9.13431613,5.67770922 9.39137788,5.67770922 C9.64843963,5.67770922 9.85558647,5.88485606 9.85558647,6.14191781 L9.85558647,11.2482122 C9.85558647,11.5052739 9.64843961,11.7149165 9.39137788,11.7149165 Z M6.60612639,11.7149165 C6.34906466,11.7149165 6.1419178,11.5077697 6.1419178,11.2507079 L6.1419178,6.14191781 C6.1419178,5.88485607 6.34906466,5.67770922 6.60612641,5.67770922 C6.86318814,5.67770922 7.07033499,5.88485606 7.07033499,6.14191781 L7.07033499,11.2482122 C7.07033499,11.5052739 6.86318814,11.7149165 6.60612639,11.7149165 Z M14.0359594,3.82087491 L11.7149165,3.82087491 L11.7149165,2.89245775 C11.7149165,2.12376827 11.0959718,1.499832 10.3322738,1.499832 L5.67770923,1.499832 C4.90901976,1.499832 4.28508349,2.12376827 4.28508349,2.89245775 L4.28508349,3.82087491 L1.96404059,3.82087491 C1.70697885,3.82087491 1.499832,4.02802174 1.499832,4.28508349 C1.499832,4.54214524 1.70697884,4.74929208 1.96404059,4.74929208 L14.0359594,4.74929208 C14.2930211,4.74929208 14.500168,4.54214524 14.500168,4.28508349 C14.500168,4.02802174 14.2930212,3.82087491 14.0359594,3.82087491 Z M5.21350066,2.89245775 C5.21350066,2.63789175 5.42314324,2.42824916 5.67770925,2.42824916 L10.3322738,2.42824916 C10.5868398,2.42824916 10.7864994,2.63290025 10.7864994,2.89245775 L10.7864994,3.82087491 L5.21350066,3.82087491 L5.21350066,2.89245775 L5.21350066,2.89245775 Z M11.2507079,14.500168 L4.75178782,14.500168 C3.98309834,14.500168 3.35916207,13.8762317 3.35916207,13.1075423 L3.35916207,6.13692631 C3.35916207,5.87986457 3.56630891,5.67271772 3.82337066,5.67271772 C4.08043241,5.67271772 4.28757925,5.87986456 4.28757925,6.13692631 L4.28757925,13.1075423 C4.28757925,13.364604 4.49722183,13.5717508 4.75178783,13.5717508 L11.2532037,13.5717508 C11.5102654,13.5717508 11.7174123,13.364604 11.7174123,13.1075423 L11.7174123,6.15439653 C11.7174123,5.89733479 11.9245591,5.69018794 12.1816209,5.69018794 C12.4386826,5.69018794 12.6458294,5.89733478 12.6458294,6.15439653 L12.6458294,13.1075423 C12.6433337,13.873736 12.0193974,14.500168 11.2507079,14.500168 Z" id="形状"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/styles/login.scss

@@ -1,10 +1,13 @@
 /* ===== PC DESIGN ===== */
-$W: 1000;
+$W: 1080;
 $H: 1920;
-$picW: 438;
-$picH: 560;
-$formW: 320;
+// $picW: 438;
+// $picH: 560;
+$picW: 1080;
+$picH: 1118;
+$formW: 420;
 $tabW: $formW / 2;
+// $rowH: 56;
 $rowH: 56;
 $buttonH: 50;
 
@@ -15,6 +18,7 @@ $containerBgImage: '../assets/images/bg.png';
 $logoWidth: 417px;
 $logoHeight: 64px;
 $logoImage: '../assets/logo/login-logo.png';
+$cnbmLogo: '../assets/logo/cnbm.png';
 // container-content
 $contentWidth: round($W / $H * 100) * 1vw;
 $contentHeight: round($picH / $W * 100) / 100 * $contentWidth;
@@ -22,7 +26,8 @@ $contentBgColor: #ffffff;
 // container-content-pic
 $picWidth: round($picW / $H * 100) * 1vw;
 $picHeight: inherit;
-$picImage: '../assets/images/pic.png';
+// $picImage: '../assets/images/pic.png';
+$picImage: '../assets/images/login-bg.png';
 // container-content-field
 $fieldWidth: $contentWidth - $picWidth;
 $fieldHeight: inherit;
@@ -34,231 +39,310 @@ $buttonHeight: $buttonH * 1px;
 
 // - - - - - 页面基础设置
 .container {
-  .login-code {
-    width: 33%;
-    height: 38px;
-    float: right;
-    img {
-      cursor: pointer;
-      width:100%;max-width:100px; height:auto;
-      vertical-align: middle;
-    }
-  }
-  // 元素
-  width: inherit;
-  height: inherit;
-  min-width: 1080px;
-  min-height: 620px;
-  background-color: $containerBgColor;
-  background-image: url($containerBgImage);
-  background-size: cover;
-  // 定位
-  position: relative;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  // 文字
-  font-size: 14px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  .logo {
-    // 元素
-    width: $logoWidth;
-    height: $logoHeight;
-    // background-image: url($logoImage);
-    // background-size: contain;
-    // 定位
-    position: absolute;
-    top: 50px;
-    left: 50%;
-    margin-left: -$logoWidth/2;
-  }
-  .content {
-    // 元素
-    width: $contentWidth;
-    height: $contentHeight;
-    background-color: #ffffff;
-    box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07);
-    border-radius: 20px;
-    // 定位
-    position: relative;
-    .pic {
-      // 元素
-      width: $picWidth;
-      height: $picHeight;
-      background-image: url($picImage);
-      background-repeat: no-repeat;
-      background-size: cover;
-      border-radius: 20px 0 0 20px;
-      // 定位
-      position: absolute;
-      top: 0;
-      left: 0;
-    }
-    .field {
-      width: $fieldWidth;
-      height: $fieldHeight;
-      // 定位
-      position: absolute;
-      top: 0;
-      left: $picWidth;
-      display:flex;
-      justify-content: center;
-      align-items: center;
-      .pc-title{ width: 100%; clear: both;}
-      .mobile-title,
-      .mobile-switch {
-        display: none;
-      }
-      .form {
-        box-sizing: border-box;
-        width: $formWidth;
-        // - - - tab
-        :deep(.el-tabs__content) {
-          padding: 20px 0 0;
-        }
-        :deep(.el-tabs__item) {
-          // 元素
-          width: $tabWidth;
-          height: $rowHeight;
-          padding: 0;
-          // 文字
-          line-height: $rowHeight;
-          color: #666666;
-        }
-        :deep(.el-tabs__item.is-active) {
-          font-weight: bold;
-          color: #2F53EB;
-        }
-        :deep(.el-tabs__active-bar) {
-          height: 3px;
-          border-radius: 2px;
-        }
-        // - - - input
-        :deep(.el-input__inner) {
-          // 元素
-          width: 100%;
-          height: $rowHeight;
-          background: #f5f5f5;
-          border: 0;
-          border-radius: 28px;
-          // 文字
-          text-align: center;
-          line-height: 19px;
-          color: #262626;
-        }
-        .code:deep(.el-input__inner) {
-          padding: 0 24px;
-          // 文字
-          text-align: left;
-        }
-        :deep(.el-input__inner::-webkit-input-placeholder) { /* WebKit browsers */
-          font-weight: 400;
-          color: #8C8C8C;
-        }
-        :deep(.el-input__inner:-moz-placeholder) { /* Mozilla Firefox 4 to 18 */
-          font-weight: 400;
-          color: #8C8C8C;
-        }
-        :deep(.el-input__inner::-moz-placeholder) { /* Mozilla Firefox 19+ */
-          font-weight: 400;
-          color: #8C8C8C;
-          opacity:1;
-        }
-        :deep(.el-input__inner:-ms-input-placeholder) { /* Internet Explorer 10+ */
-          font-weight: 400;
-          color: #8C8C8C !important;
-        }
-        :deep(.el-form-item) {
-          position: relative;
-          .button-code {
-            // 元素
-            height: $rowHeight;
-            box-sizing: border-box;
-            // 定位
-            position: absolute;
-            top: 0;
-            right: 20px;
-            z-index: 1;
-            // 文字
-            line-height: 20px;
-            font-size: 14px;
-            font-family: PingFang SC;
-            font-weight: 400;
-            color: #2F53EB;
-            span {
-              padding-left: 15px;
-              border-left: 2px solid #D9D9D9;
-            }
-          }
-        }
-        :deep(.el-form-item__error) {
-          padding-left: 24px;
-        }
-        .button {
-          width: 100%;
-          height: $buttonHeight;
-          background: rgba(24, 144, 255, 0.2);
-          border: 0;
-          border-radius: 24px;
-          margin-bottom: 20px;
-          // 文字
-          line-height: 26px;
-          font-size: 20px;
-          color: #FFFFFF;
-        }
-        .button-active {
-          background: #2F53EB;
-          box-shadow: 0px 2px 8px rgba(0, 80, 184, 0.2);
-        }
-      }
-    }
-  }
-  .footer {
-    // 元素
-    height: 16px;
-    line-height: 16px;
-    font-size: 12px;
-    color: #8c8c8c;
-    // 定位
-    position: absolute;
-    bottom: 30px;
-    a,
-    a:hover,
-    a:active {
-      color: inherit;
-      text-decoration: none;
-    }
-  }
+	.login-code {
+		width: 33%;
+		height: 38px;
+		float: right;
+		img {
+			cursor: pointer;
+			width: 100%;
+			max-width: 100px;
+			height: auto;
+			vertical-align: middle;
+		}
+	}
+	// 元素
+	width: inherit;
+	height: inherit;
+	min-width: 1080px;
+	min-height: 620px;
+	background-color: $containerBgColor;
+	// background-image: url($containerBgImage);
+	background-size: cover;
+	// 定位
+	position: relative;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	// 文字
+	font-size: 14px;
+	font-family: Microsoft YaHei;
+	font-weight: 400;
+	.logo {
+		// 元素
+		width: $logoWidth;
+		height: $logoHeight;
+		// background-image: url($logoImage);
+		// background-size: contain;
+		// 定位
+		position: absolute;
+		top: 50px;
+		left: 50%;
+		margin-left: -$logoWidth/2;
+	}
+	.content {
+		// 元素
+		// width: $contentWidth;
+		// height: $contentHeight;
+		width: 100%;
+		height: 100%;
+		background-color: #ffffff;
+		// box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07);
+		// border-radius: 20px;
+		// 定位
+		position: relative;
+		display: flex;
+
+		.pic {
+			// 元素
+			width: $picWidth;
+			height: $picHeight;
+			background-image: url($picImage);
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			background-position: 0 0;
+			position: relative;
+
+			&::after {
+        content: '';
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+        // background: #f003;
+        display: inline-block;
+			}
+		}
+		.field {
+			// background: #ccc3;
+			position: relative;
+			padding-top: 196px;
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			// justify-content: center;
+			align-items: center;
+			.pc-title {
+				width: 100%;
+				text-align: center;
+				clear: both;
+				position: relative;
+				top: -36px;
+
+				// h3.title {
+				// 	position: relative;
+
+				// 	&::before {
+				// 		content: '';
+				// 		background: url($cnbmLogo) 100% / 100% no-repeat;
+				// 		height: 48px;
+				// 		width: 48px;
+				// 		position: absolute;
+				// 		left: 0px;
+				// 		top: 4px;
+				// 		display: inline-block;
+				// 	}
+				// }
+			}
+			.mobile-title,
+			.mobile-switch {
+				display: none;
+			}
+			.form {
+				margin-top: 32px;
+				box-sizing: border-box;
+				// width: $formWidth;
+				width: 100%;
+				// - - - tab
+				:deep(.el-tabs__nav) {
+					// background: #f0f3;
+				}
+				:deep(.el-tabs__content) {
+					padding: 20px 0 0;
+				}
+				:deep(.el-tabs__item) {
+					user-select: none;
+					// 元素
+					width: $tabWidth;
+					height: $rowHeight;
+					padding: 0;
+					// 文字
+					line-height: $rowHeight;
+					color: #666666;
+					font-size: 18px;
+					font-weight: 400;
+					text-align: center;
+				}
+				:deep(.el-tabs__item.is-active) {
+					font-weight: 500;
+					color: #2f53eb;
+				}
+				:deep(.el-tabs__active-bar) {
+					height: 3px;
+					border-radius: 2px;
+				}
+				// - - - input
+				:deep(.el-input__inner) {
+					// 元素
+					width: 100%;
+					height: $rowHeight;
+					background: #f5f5f5;
+					border: 0;
+					border-radius: 28px;
+					// 文字
+					text-align: center;
+					line-height: 19px;
+					color: #262626;
+				}
+				.code:deep(.el-input__inner) {
+					padding: 0 24px;
+					// 文字
+					text-align: left;
+				}
+				:deep(.el-input__inner::-webkit-input-placeholder) {
+					/* WebKit browsers */
+					font-weight: 400;
+					color: #8c8c8c;
+				}
+				:deep(.el-input__inner:-moz-placeholder) {
+					/* Mozilla Firefox 4 to 18 */
+					font-weight: 400;
+					color: #8c8c8c;
+				}
+				:deep(.el-input__inner::-moz-placeholder) {
+					/* Mozilla Firefox 19+ */
+					font-weight: 400;
+					color: #8c8c8c;
+					opacity: 1;
+				}
+				:deep(.el-input__inner:-ms-input-placeholder) {
+					/* Internet Explorer 10+ */
+					font-weight: 400;
+					color: #8c8c8c !important;
+				}
+				:deep(.el-form-item) {
+					position: relative;
+					.button-code {
+						// 元素
+						height: $rowHeight;
+						box-sizing: border-box;
+						// 定位
+						position: absolute;
+						top: 0;
+						right: 20px;
+						z-index: 1;
+						// 文字
+						line-height: 20px;
+						font-size: 14px;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #2f53eb;
+						span {
+							padding-left: 15px;
+							border-left: 2px solid #d9d9d9;
+						}
+					}
+				}
+				:deep(.el-form-item__error) {
+					padding-left: 24px;
+				}
+				.button {
+					width: 100%;
+					height: $buttonHeight;
+					background: rgba(24, 144, 255, 0.2);
+					border: 0;
+					border-radius: 24px;
+					margin-bottom: 20px;
+					// 文字
+					line-height: 26px;
+					font-size: 20px;
+					color: #ffffff;
+				}
+				.button-active {
+					background: #2f53eb;
+					box-shadow: 0px 2px 8px rgba(0, 80, 184, 0.2);
+				}
+			}
+		}
+	}
+
+	.login-form {
+		* {
+			user-select: none;
+		}
+		// - - - input
+		:deep(.el-input__inner) {
+			// 元素
+			width: 420px;
+			height: 66px;
+			color: #262626;
+			font-size: 18px;
+		}
+		:deep(.el-checkbox__label) {
+			font-size: 18px;
+			line-height: 14px;
+		}
+	}
+
+	.footer {
+		user-select: none;
+		// 元素
+		height: 16px;
+		line-height: 16px;
+		font-size: 12px;
+		color: #8c8c8c;
+		// 定位
+		position: absolute;
+		bottom: 30px;
+		a,
+		a:hover,
+		a:active {
+			color: inherit;
+			text-decoration: none;
+		}
+	}
 }
 
 // - - - - - PC 最小尺寸设置
 @media screen and (min-width: 599px) and (max-width: 1366px) {
-  .container {
-    .content {
-      width: 710px;
-      height: 397px;
-      .pic {
-        width: 314px;
-      }
-      .field {
-        width: calc(710px - 314px);
-        left: 314px;
-        .form {
-          width: 320px;
-          :deep(.el-input__inner) {
-            width: 320px;
-            height: 56px;
-          }
-          .button {
-            height: 50px;
-          }
-        }
-      }
-    }
-  }
-}
+	.container {
+		min-width: 599px;
+		.content {
+			// width: 710px;
+			// height: 397px;
+			width: 100%;
+			height: 100%;
+			.pic {
+				// width: 314px;
+				display: none;
+			}
+			.field {
+				// width: calc(710px - 314px);
+				// left: 314px;
+				// justify-content: center;
+				width: 100%;
 
+				.pc-title {
+					h3 {
+						font-size: 2.4rem !important;
+					}
+				}
+
+				.form {
+					// width: 320px;
+					:deep(.el-input__inner) {
+						width: 320px;
+						height: 56px;
+					}
+					.button {
+						height: 50px;
+					}
+				}
+			}
+		}
+	}
+}
 
 /* ===== MOBILE DESIGN ===== */
 $mobileW: 375;
@@ -273,115 +357,142 @@ $mobileButtonH: 48;
 $mobileContainerBgImage: '../assets/images/bg-mobile.png';
 // container-content
 $mobileContentWidth: round($mobileContentW / $mobileW * 100) * 1vw;
-$mobileContentHeight: round($mobileContentH / $mobileW * 100) / 100 * $mobileContentWidth;
+$mobileContentHeight: round($mobileContentH / $mobileW * 100) / 100 *
+	$mobileContentWidth;
 // container-content-field-form
-$mobileFormWidth: round($mobileFormW / $mobileW *100) * 1vw;
+$mobileFormWidth: round($mobileFormW / $mobileW * 100) * 1vw;
 $mobileRowHeight: $mobileRowH * 1px;
 $mobileButtonHeight: $mobileButtonH * 1px;
 $iconBgImage: '../assets/images/icon.png';
 
 // - - - - - 移动端设置
 @media screen and (max-width: 599px) {
-  .container {
-    // 元素
-    background-image: url($mobileContainerBgImage);
-    min-width: 280px;
-    min-height: 568px;
-    // 文字
-    font-size: 17px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    .logo {
-      display: none;
-    }
+	.container {
+		// 元素
+		background-image: url($mobileContainerBgImage);
+		min-width: 280px;
+		min-height: 568px;
+		// 文字
+		font-size: 14px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		.logo {
+			display: none;
+		}
 
-    .content {
-      // 元素
-      width: $mobileContentWidth;
-      height: $mobileContentHeight;
-      min-width: 250px;
-      min-height: 340px;
-      // 定位
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      .pic {
-        display: none;
-      }
-      .field {
-        // 元素
-        width: inherit;
-        min-height: inherit;
-        // 定位
-        left: 0;
-        display: flex;
-        flex-direction: column;
-        .mobile-title {
-          // 元素
-          margin: 0 0 20px;
-          display: block;
-        }
-        .form {
-          width: $mobileFormWidth;
-          // - - - tab
-          :deep(.el-tabs__header) {
-            display: none;
-          }
-          :deep(.el-tabs__content) {
-            padding: 0;
-          }
-          // - - - input
-          :deep(.el-input__inner) {
-            height: $mobileRowHeight;
-            line-height: 24px;
-            // 文字
-            text-align: center;
-            color: #262626;
-          }
-          :deep(.el-form-item) {
-            .button-code {
-              // 元素
-              height: $mobileRowHeight;
-            }
-          }
-          .button {
-            height: $mobileButtonHeight;
-            line-height: 24px;
-            color: #FFFFFF;
-          }
-        }
-        .mobile-switch {
-          display: block;
-          line-height: 20px;
-          font-size: 14px;
-          font-weight: 400;
-          color: #595959;
+		.pc-title {
+			display: none;
+		}
+
+		.content {
+			// 元素
+			width: $mobileContentWidth;
+			height: $mobileContentHeight;
+			min-width: 250px;
+			min-height: 340px;
+			// 定位
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.pic {
+				display: none;
+			}
+			.field {
+        padding: 0;
+				// 元素
+				width: inherit;
+				min-height: inherit;
+				// 定位
+				left: 0;
+				display: flex;
+				flex-direction: column;
+
+				.mobile-title {
+					// 元素
+					margin: 0;
+					display: block;
+				}
+
+				.form {
           margin: 0;
-          .icon {
-            width: 14px;
-            height: 14px;
-            display: inline-block;
-            background-image: url($iconBgImage);
-            background-size: cover;
-          }
-        }
-        .mobile-switch:hover {
-          cursor: pointer;
-        }
-      }
-    }
-    .footer {
-      // 元素
-      font-size: 12px;
-      font-family: PingFang SC;
-      font-weight: 400;
-      line-height: 17px;
-      color: #333333;
-      opacity: 0.6;
-      // 定位
-      position: absolute;
-      bottom: 20px;
-    }
-  }
+					width: $mobileFormWidth;
+					// - - - tab
+					:deep(.el-tabs__header) {
+						display: none;
+					}
+					:deep(.el-tabs__content) {
+						padding: 0;
+					}
+					// - - - input
+					:deep(.el-input__inner) {
+						height: $mobileRowHeight;
+						line-height: 24px;
+						// 文字
+						text-align: center;
+						color: #262626;
+					}
+					:deep(.el-form-item) {
+						.button-code {
+							// 元素
+							height: $mobileRowHeight;
+						}
+					}
+					.button {
+						height: $mobileButtonHeight;
+						line-height: 24px;
+						color: #ffffff;
+					}
+				}
 
+				.login-form {
+					:deep(.el-input__inner) {
+						height: $mobileRowHeight;
+						line-height: 24px;
+						// 文字
+						text-align: center;
+						color: #262626;
+					}
+
+          :deep(#button-form-item) {
+            margin: 0 !important;
+						button {
+							// 元素
+							height: $mobileRowHeight;
+						}
+					}
+				}
+				.mobile-switch {
+					display: block;
+					line-height: 20px;
+					font-size: 14px;
+					font-weight: 400;
+					color: #595959;
+					margin: 0;
+					.icon {
+						width: 14px;
+						height: 14px;
+						display: inline-block;
+						background-image: url($iconBgImage);
+						background-size: cover;
+					}
+				}
+				.mobile-switch:hover {
+					cursor: pointer;
+				}
+			}
+		}
+
+		.footer {
+			// 元素
+			font-size: 12px;
+			font-family: PingFang SC;
+			font-weight: 400;
+			line-height: 17px;
+			color: #333333;
+			opacity: 0.6;
+			// 定位
+			// position: absolute;
+			bottom: -32px;
+		}
+	}
 }

src/components/ButtonNav/index.vue

@@ -0,0 +1,141 @@
+<template>
+  <!-- 按钮切换 -->
+  <div v-if="buttonMode" class="button-nav">
+    <button v-for="m in menus" :key="m" @click="handleClick(m)"
+      :data-text="m"
+      :class="[m === currentMenu ? 'active' : '']"
+      ></button>
+  </div>
+  <!-- 标签切换 -->
+  <div v-else class="custom-tabs" style="height: 100%; width: 100%">
+    <el-tabs class="tag-nav" v-model="currentMenu" style="height: 100%" @tab-click="handleTabClick">
+      <el-tab-pane v-for="(m, idx) in menus" :key="m" :label="idx == 0 ? `\u2002${m}\u2002` : `\u3000${m}\u3000`"
+        :name="m">
+        <slot :name="`tab${idx + 1}`"></slot>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ButtonNav",
+  props: {
+    menus: {
+      type: Array,
+      required: true,
+      default: () => [],
+      validator: (val) => val.length > 0,
+    },
+    buttonMode: {
+      type: Boolean,
+      default: true,
+    },
+    // 新增：支持外部传入选中值（v-model 绑定）
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      currentMenu: "",
+    };
+  },
+  created() {
+    // 优先使用外部传入的 value，否则默认第一个
+    this.currentMenu = this.value || this.menus[0];
+  },
+  watch: {
+    // 监听外部 value 变化，同步到内部 currentMenu
+    value(newVal) {
+      this.currentMenu = newVal;
+    },
+    // 监听内部 currentMenu 变化，通知外部
+    currentMenu(val) {
+      this.$emit("input", val); // 触发 v-model 同步
+      this.$emit("change", val); // 保留原 change 事件
+    },
+  },
+  methods: {
+    // 按钮点击事件
+    handleClick(m) {
+      this.currentMenu = m;
+    },
+    // 标签点击事件（el-tabs 自带）
+    handleTabClick(tab) {
+      this.currentMenu = tab.name;
+    },
+  },
+};
+</script>
+
+<!-- 样式不变 -->
+<style scoped lang="scss">
+.button-nav {
+  width: 100%;
+  display: flex;
+  gap: 12px;
+
+  * {
+    user-select: none;
+  }
+
+  button {
+    cursor: pointer;
+    appearance: none;
+    outline: none;
+    border: none;
+    background: #fff;
+    border-radius: 8px;
+    padding: 15px;
+    color: #888;
+    letter-spacing: 2px;
+    flex: 1;
+    box-sizing: padding-box;
+    position: relative;
+
+    &::after {
+      content: attr(data-text);
+      position: absolute;
+      top: 5px;
+      left: 50%;
+      font-size: 16px;
+      font-weight: 500;
+      transform: translate(-50%);
+    }
+
+    &.active {
+      color: #111;
+      //border-bottom: 2px solid #0b58ff;
+      box-shadow: 0px 2px 1px 1px #0b58ff;
+    }
+  }
+}
+</style>
+
+<style scoped>
+.custom-tabs>>>.el-tabs__header {
+  margin-bottom: 8px;
+  display: inline-block;
+  /* transform: translateY(-12px); */
+}
+
+.custom-tabs>>>.el-tabs__item {
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+  line-height: 36px !important;
+  height: 36px;
+}
+
+.custom-tabs>>>.el-tabs__content {
+  height: calc(100% - 42px);
+}
+
+.custom-tabs>>>.el-tab-pane {
+  box-sizing: border-box;
+  height: 100%;
+  padding: 20px;
+  border: 10px solid #f002;
+}
+</style>

src/components/DialogForm/index.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: dialogForm.vue
     author: liubin
     date: 2023-08-15 10:32:36
@@ -21,13 +21,11 @@
 						v-model="form[col.prop]"
 						@change="$emit('update', form)"
 						:placeholder="`请输入${col.label}`"
-						:disabled="disabled"
 						v-bind="col.bind" />
 					<el-input
 						v-if="col.textarea"
 						type="textarea"
 						v-model="form[col.prop]"
-						:disabled="disabled"
 						@change="$emit('update', form)"
 						:placeholder="`请输入${col.label}`"
 						v-bind="col.bind" />
@@ -35,7 +33,6 @@
 						v-if="col.select"
 						v-model="form[col.prop]"
 						:placeholder="`请选择${col.label}`"
-						:disabled="disabled"
 						@change="$emit('update', form)"
 						v-bind="col.bind">
 						<el-option
@@ -48,23 +45,18 @@
 						v-if="col.datetime"
 						v-model="form[col.prop]"
 						type="datetime"
-						:disabled="disabled"
 						:placeholder="`请选择${col.label}`"
 						value-format="timestamp"
-						@change="$emit('update', form)"
 						v-bind="col.bind"></el-date-picker>
 					<el-switch
 						v-if="col.switch"
 						v-model="form[col.prop]"
-						:disabled="disabled"
 						active-color="#0b58ff"
 						inactive-color="#e1e1e1"
-						@change="$emit('update', form)"
 						v-bind="col.bind"></el-switch>
 					<component
 						v-if="col.subcomponent"
 						:key="col.key"
-						:disabled="disabled"
 						:is="col.subcomponent"
 						:inlineStyle="col.style"></component>
 
@@ -87,7 +79,6 @@
 							:headers="uploadHeaders"
 							:show-file-list="false"
 							icon="el-icon-upload2"
-							:disabled="disabled"
 							:before-upload="beforeUpload"
 							:on-success="handleUploadSuccess"
 							v-bind="col.bind">
@@ -101,13 +92,13 @@
 								{{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
 							</div>
 						</el-upload>
-
 						<uploadedFile
 							class="file"
 							v-for="file in form[col.prop] || []"
 							:file="file"
 							:key="file.fileUrl"
-							@delete="!disabled && handleDeleteFile(file)" />
+							@delete="handleDeleteFile(file)"
+							@Preview="handlePreview(file)" />
 					</div>
 				</el-form-item>
 			</el-col>
@@ -118,7 +109,6 @@
 <script>
 import { getAccessToken } from '@/utils/auth';
 import tupleImg from '@/assets/images/tuple.png';
-import cache from '@/utils/cache';
 
 /**
  * 找到最长的label
@@ -148,6 +138,9 @@ const uploadedFile = {
 		handleDelete() {
 			this.$emit('delete', this.file);
 		},
+		handlePreview() {
+			this.$emit('Preview', this.file);
+		},
 	},
 	mounted() {},
 	render: function (h) {
@@ -166,7 +159,7 @@ const uploadedFile = {
 					cursor: 'pointer',
 					display: 'inline-block',
 				}}>
-				{this.file.fileName}
+				<el-button onClick={this.handlePreview}>{this.file.fileName}</el-button>
 				<el-button
 					type="text"
 					icon="el-icon-close"
@@ -200,7 +193,7 @@ export default {
 			type: Boolean,
 			default: false,
 		},
-		hasFiles: {
+		hasFile: {
 			type: Boolean,
 			default: false,
 		},
@@ -246,7 +239,7 @@ export default {
 		dataForm: {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
-				if (this.hasFiles) {
+				if (this.hasFile) {
 					this.form.files = this.form.files ?? [];
 				}
 			},
@@ -266,6 +259,20 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
+		async handlePreview(file) {
+			const data = await this.$axios({
+				url: file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+			const link = document.createElement('a');
+			link.href = window.URL.createObjectURL(new Blob([data]));
+			link.download = file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+			window.URL.revokeObjectURL(link.href);
+		},
 		// getCode
 		async getCode(url) {
 			const response = await this.$axios(url);
@@ -286,6 +293,7 @@ export default {
 					} else if (opt.url) {
 						// 如果有 depends，则暂时先不获取，注册一个watcher
 						if (opt.depends) {
+							console.log('[handleOptions] setting watch');
 							this.$watch(
 								() => this.form[opt.depends],
 								(id) => {
@@ -308,7 +316,7 @@ export default {
 									});
 								},
 								{
-									immediate: false,
+									immediate: true,
 								}
 							);
 							return;
@@ -326,11 +334,6 @@ export default {
 										'list' in response.data
 											? response.data.list
 											: response.data;
-
-									if (opt.cache) {
-										cache.store(opt.cache, list);
-									}
-
 									this.$set(
 										this.optionListOf,
 										opt.prop,
@@ -369,7 +372,9 @@ export default {
 			if (!promiseList.length) this.formLoading = false;
 		},
 		// 上传成功的特殊处理
-		beforeUpload() {},
+		beforeUpload(file) {
+      console.log(file)
+    },
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
 			this.form.files.push({

src/filter/code-filter.js

@@ -0,0 +1,94 @@
+
+/*
+ * @Date: 2020-12-29 16:49:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-11 13:40:48
+ * @FilePath: \basic-admin\src\filters\basicData\index.js
+ * @Description:
+ */
+
+const table = {
+  lineStatus: {
+    1: '生产中',
+    2: '停止',
+    3: '未知',
+  },
+  deactivate: {
+    1: '启用',
+    0: '停用',
+  },
+  wareType: {
+    1: '缓存',
+    2: '活动',
+    3: '其它',
+  },
+  reportType: {
+    2: '日',
+    3: '周',
+    4: '月',
+    5: '年',
+  },
+  manual: {
+    1: '手动',
+    0: '自动',
+  },
+}
+
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm), '');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay(),
+    w: '',
+  }
+  const time_str = format.replace(/{([ymdhisaw])+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
+    if (key === 'w') {
+      const current = new Date(time);
+      current.setHours(0, 0, 0);
+      current.setDate(current.getDate() + 4 - (current.getDay() || 7));
+      const firstThursday = new Date(current.getFullYear(), 0, 4);
+      firstThursday.setDate(firstThursday.getDate() + 4 - (firstThursday.getDay() || 7));
+      const time1 = current.getTime() - firstThursday.getTime();
+      const weeks = Math.ceil(time1 / (7 * 24 * 3600 * 1000));
+      return (weeks + 1)
+    }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+export default function (dictTable) {
+  return function (val) {
+    return table?.[dictTable]?.[val]
+  }
+}

src/main.js

@@ -71,9 +71,7 @@ import DocAlert from '@/components/DocAlert';
 // 头部标签插件
 import VueMeta from 'vue-meta';
 import CodeBrickZj from 'code-brick-zj';
-import { hiPrintPlugin,disAutoConnect } from 'vue-plugin-hiprint'
-disAutoConnect();
-Vue.use(hiPrintPlugin)
+
 Vue.use(CodeBrickZj)
 Vue.use(directive);
 Vue.use(plugins);

src/mixins/basic-add.js

@@ -2,28 +2,26 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2023-11-02 15:33:39
+ * @LastEditTime: 2024-04-10 15:46:19
  * @Description:
  */
-import { listData } from "@/api/system/dict/data";
+import { listData } from "@/api/system/dict/data"; //数据字典接口
 export default {
   data() {
     /* eslint-disable */
     return {
       urlOptions: {
-        createURL: '',
-        updateURL: '',
-        infoURL: '',
-        codeURL: '',
-        getOption: false, //是否加载获取下拉框方法
-        isGetCode: false, //是否加载获取code方法
-        getDictList: false, //是否加载获取数据字典方法
+        createURL: '', //新增接口
+        updateURL: '', //编辑提交接口
+        infoURL: '', //编辑时获取单条数据接口
+        codeURL: '', //获取code接口（返回结果为dataForm.code字段）
         optionArrUrl: [], //需要获取下拉框的方法数组
         optionArr: {}, //需要获取下拉框的方法数组的返回结果
-        dictList: {}, //需要获取数据字典的方法数组的返回结果
+        dictNameList: [], //数据字典name数组
+        dictArr: {}, //需要获取数据字典的方法数组的返回结果
       },
       visible: false,
-      setData: false
+      setData: false, // 是否需要【编辑时获取单条数据接口】返回的数据操作
     }
   },
   created() {
@@ -32,12 +30,12 @@ export default {
   },
   methods: {
     init(id) {
-      this.dataForm.id = id || "";
+      this.dataForm.id = id || null;
       this.visible = true;
-      if (this.urlOptions.getOption) {
+      if (this.urlOptions.optionArrUrl.length > 0) {
         this.getArr()
       }
-      if (this.urlOptions.getDictList) {
+      if (this.urlOptions.dictNameList.length > 0) {
         this.getDict()
       }
       this.$nextTick(() => {
@@ -50,12 +48,13 @@ export default {
             }
           });
         } else {
-          if (this.urlOptions.isGetCode) {
+          if (this.urlOptions.codeURL) {
             this.getCode()
           }
 				}
       });
     },
+    /** 获取code */
 		getCode() {
 			this.urlOptions.codeURL()
 				.then(({ data: res }) => {
@@ -63,6 +62,7 @@ export default {
 				})
 				.catch(() => {});
 		},
+    /** 获取下拉框数组 */
     getArr() {
       const params = {
         pageSize: 100,
@@ -78,14 +78,14 @@ export default {
     },
     /** 查询字典数据列表 */
     getDict() {
-      this.nameList.forEach((item,index)=>{
+      this.urlOptions.dictNameList.forEach((item,index)=>{
         const queryParams = {
           pageNo: 1,
           pageSize: 99,
           dictType: item,
         }
         listData(queryParams).then(response => {
-          this.$set(this.urlOptions.dictList, `dict${index}`, response.data.list)
+          this.$set(this.urlOptions.dictArr, `dict${index}`, response.data.list)
         });
       })
     },
@@ -112,6 +112,7 @@ export default {
         });
       });
     },
+    /** 清空form */
     formClear() {
       if (this.$refs.dataForm!==undefined) {
           this.$refs.dataForm.resetFields();

src/mixins/basic-page.js

@@ -0,0 +1,128 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-02 09:33:29
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '', //获取table接口
+        deleteURL: '', //删除接口
+        exportURL: '' //导出接口
+      },
+      tableData: [], //table数据
+      listQuery: { //分页
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false, //导出完成的加载状态是否开启
+      dataListLoading: false, //获取table的加载状态是否开启
+      addOrEditTitle: '', //dialog的title
+      addOrUpdateVisible: false, //dialog状态
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+    // 新增
+    addOrUpdateHandle(id) {
+      this.addOrEditTitle = "新增";
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否确认删除${name ? '名称为"' + name + '"' : '序号为"' + index + '"'}的数据项?`, "系统提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
+    // dialog取消
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    // dialog确定
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    // dialog的父组件方法this.$emit("refreshDataList");
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '报表.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}

src/mixins/lb/basicPageMixin.js

@@ -28,59 +28,10 @@ export default {
 			// tableBtn: [], // 占位
 			// searchBarFormConfig: [], // 占位
 			// // 弹窗表单配置
-			// dialogFormConfig: [], // 
-			updateUrl: '',
-			addUrl: '',
-			pageUrl: '',
-			infoUrl: '',
-			basePath: '',
-			form: {}
+			// dialogFormConfig: [], // 占位
 		};
 	},
-	computed: {
-		addPath() {
-			return this.basePath + '/create'
-		},
-		updatePath() {
-			return this.basePath + '/update'
-		},
-		deletePath() {
-			return this.basePath + '/delete'
-		},
-		infoPath() {
-			return this.basePath + '/get'
-		},
-		pagePath() {
-			return this.basePath + '/page'
-		}
-	},
 	methods: {
-		// utils
-		http(url, method, payload) {
-			return this.$axios({
-				url,
-				method,
-				params: method === 'get' ? payload : null,
-				data: method !== 'get' ? payload : null,
-			})
-		},
-		put(payload) {
-			return this.http(this.updateUrl == '' ? this.updatePath : this.updateUrl, 'put', payload);
-		},
-		post(payload) {
-			return this.http(this.addUrl == '' ? this.addPath : this.addUrl, 'post', payload);
-		},
-		recv(payload) {
-			return this.http(this.pageUrl == '' ? this.pagePath : this.pageUrl, 'get', payload);
-		},
-		info(payload) {
-			return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
-		},
-		del(payload) {
-			return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
-		},
-
-
 		// 过滤后端传回的详情数据
 		filterData(data, keys) {
 			const obj = {};

src/mixins/lb/tableHeightMixin.js

@@ -0,0 +1,20 @@
+export default {
+	data() {
+		return {
+			tableH: this.tableHeight(260),
+		};
+	},
+	created() {
+		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+		window.addEventListener('resize', this._setTableHeight);
+	},
+	destroyed() {
+		window.removeEventListener('resize', this._setTableHeight);
+	},
+	methods: {
+		_setTableHeight() {
+			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+			// this.tableH = this.tableHeight(260);
+		},
+	},
+};

src/mixins/tableHeightMixin.js

@@ -0,0 +1,20 @@
+export default {
+	data() {
+		return {
+			tableH: this.tableHeight(260),
+		};
+	},
+	created() {
+		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+		window.addEventListener('resize', this._setTableHeight);
+	},
+	destroyed() {
+		window.removeEventListener('resize', this._setTableHeight);
+	},
+	methods: {
+		_setTableHeight() {
+			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+			// this.tableH = this.tableHeight(260);
+		},
+	},
+};

src/router/index.js

@@ -70,17 +70,18 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/',
+    path: "",
     component: Layout,
-    // redirect: 'core/base/factory',
-    // children: [{
-    //   path: 'index',
-    //   redirect: 'core/base/factory',
-    //   component: (resolve) => require(['@/views/index'], resolve),
-    //   name: '首页',
-    //   meta: { title: '首页', icon: 'dashboard', affix: true }
-    // }
-    // ]
+    redirect: "index",
+    children: [
+      {
+        path: "index",
+        component: (resolve) => require(["@/views/core/base/factory/index"], resolve),
+        name: "首页",
+        meta: { title: "首页", icon: "dashboard", affix: true },
+        hidden: true
+      },
+    ],
   },
   {
     path: '/user',

src/styles/index.scss

@@ -180,7 +180,6 @@ input, textarea{
 // 抽屉head区域---start
 .el-drawer__header {
   padding-bottom: 20px;
-  padding-left: 30px;
   margin-bottom: 23px;
   font-size: 20px;
   font-weight: 500;

src/utils/cache.js

@@ -1,53 +0,0 @@
-let timers = [];
-
-export default {
-
-    exists(key) {
-        const _ = localStorage.getItem('stored_keys');
-        return _ ? _.split(',')?.indexOf(key) != -1 : false;
-    },
-
-    store(key, value, duration = null) {
-        if (!localStorage.getItem('stored_keys')) localStorage.setItem('stored_keys', key);
-        else localStorage.setItem('stored_keys', localStorage.getItem('stored_keys') + ',' + key);
-
-        localStorage.setItem(key, JSON.stringify(value));
-        console.log('store duration', duration)
-        if (duration) {
-            if (timers[key]) clearTimeout(timers[key]);
-            timers[key] = setTimeout(() => {
-                console.log("clear cache", key)
-                this.clear([key]);
-            }, duration * 1000);
-        }
-    },
-
-    /**
-     * 
-     * @param {*} key 
-     * @param {*} cb 
-     * @param {*} param2 force 强制更新，调用cb
-     * @returns 
-     */
-    async getList(key, cb = null, { force = false, duration = null } = {}) {
-        if (this.exists(key) && !force) {
-            return JSON.parse(localStorage.getItem(key))
-        } else {
-            const list = await cb();
-            this.store(key, list, duration);
-            return list;
-        }
-    },
-
-    clear(keys) {
-        if (keys && keys.length) {
-            let stored_keys = localStorage.getItem('stored_keys').split(',');
-            keys.forEach((key) => {
-                stored_keys = stored_keys.filter((item) => item != key);
-            });
-            localStorage.setItem('stored_keys', stored_keys);
-            return;
-        }
-        localStorage.removeItem('stored_keys');
-    },
-}

src/utils/dict.js

@@ -86,24 +86,17 @@ export const DICT_TYPE = {
   // ============== PRODUCT - 产品模块 =============
   UNIT_DICT: 'unit_dict',
   PRODUCT_TYPE: 'product_type',
+  PROCESS_TYPE: 'process_type',
 
   // ============== ENERGY - 能源模块 =============
   ENERGY_UNIT: 'energy_unit',
+
+  // ============== ENERGY - 能源模块 =============
   EQU_ALARM_LEVEL: 'equ_alarm_level',
   MONITOR_INDEX_TYPE: 'monitor_index_type',
   OBJECT_TYPE: 'object_type',
   STATISTIC_TYPE: 'statistic_type',
-  TIME_DIM: 'time_dim',
-
-  // ============== ORDER - 订单模块 =============
-  ORDER_STATUS: 'order_status',
-  ORDER_ORIGIN: 'order_Origin',
-  ORDER_PRIORITY: 'order_priority',
-  PACK_SPEC: 'pack_spec',
-  
-  // ============== EQUIPMENT - 设备模块 =============
-  MAINTAIN_TYPE: 'maintain_type',
-  FAULT_LEVEL: 'fault-level',
+  TIME_DIM: 'time_dim'
 }
 
 /**

src/utils/index.js

@@ -217,7 +217,7 @@ export function getTime(type) {
 export function debounce(func, wait, immediate) {
   let timeout, args, context, timestamp, result
 
-  const later = function () {
+  const later = function() {
     // 据上一次触发时间间隔
     const last = +new Date() - timestamp
 
@@ -234,7 +234,7 @@ export function debounce(func, wait, immediate) {
     }
   }
 
-  return function (...args) {
+  return function(...args) {
     context = this
     timestamp = +new Date()
     const callNow = immediate && !timeout
@@ -438,7 +438,3 @@ export function toCamelCase(str, upperCaseFirst) {
 
   return str;
 }
-
-export function IdToName(targetId, source, prop = 'name') {
-  return source.find(item => item.id === targetId)?.[prop]
-}

src/utils/ruoyi.js

@@ -48,6 +48,50 @@ export function parseTime(time, pattern) {
   return time_str
 }
 
+// 日期格式化(仅适用表格)
+export function parseTimeTable(pattern) {
+  return function(time){
+    if (arguments.length === 0 || !time) {
+      return null
+    }
+    const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+    let date
+    if (typeof time === 'object') {
+      date = time
+    } else {
+      if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+        time = parseInt(time)
+      } else if (typeof time === 'string') {
+        time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm),'');
+      }
+      if ((typeof time === 'number') && (time.toString().length === 10)) {
+        time = time * 1000
+      }
+      date = new Date(time)
+    }
+    const formatObj = {
+      y: date.getFullYear(),
+      m: date.getMonth() + 1,
+      d: date.getDate(),
+      h: date.getHours(),
+      i: date.getMinutes(),
+      s: date.getSeconds(),
+      a: date.getDay()
+    }
+    const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+      let value = formatObj[key]
+      // Note: getDay() returns 0 on Sunday
+      if (key === 'a') {
+        return ['日', '一', '二', '三', '四', '五', '六'][value]
+      }
+      if (result.length > 0 && value < 10) {
+        value = '0' + value
+      }
+      return value || 0
+    })
+    return time_str
+  }
+}
 // 表单重置
 export function resetForm(refName) {
   if (this.$refs[refName]) {

src/views/base/coreAlarmLog/index.vue

@@ -1,182 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-	</div>
-</template>
-
-<script>
-import basicPage from '../../core/mixins/basic-page';
-import { parseTime } from '../../core/mixins/code-filter';
-import {
-	getcoreAlarmLogPage
-} from '@/api/base/coreAlarmLog';
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-
-const tableProps = [
-	{
-		prop: 'alarmTime',
-		label: '报警时间',
-		filter: parseTime
-	},
-	{
-		prop: 'alarmSource',
-		label: '报警来源'
-	},
-	{
-		prop: 'alarmType',
-		label: '报警类型'
-	},
-	{
-		prop: 'alarmGrade',
-		label: '报警级别'
-	},
-	{
-		prop: 'alarmReason',
-		label: '报警原因'
-	},
-	{
-		prop: 'alarmContent',
-		label: '报警详细'
-	}
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getcoreAlarmLogPage
-			},
-			tableProps,
-			tableBtn: [].filter((v)=>v),
-			tableData: [],
-			listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-				alarmSource: undefined,
-				alarmGrade: undefined,
-				alarmTime: []
-      },
-			formConfig: [
-				{
-					type: 'input',
-					label: '报警来源',
-					placeholder: '报警来源',
-					param: 'name',
-				},
-				{
-          type: 'datePicker',
-          label: '时间段',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          width: 350,
-          param: 'time'
-        },
-				{
-					type: 'select',
-					label: '报警级别',
-					placeholder: '请选择报警级别',
-					param: 'alarmGrade',
-					selectOptions: [],
-					filterable: true,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				}
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:core-alarm-log:create') ? 'button' : '',
-				// 	btnName: '新增',
-				// 	name: 'add',
-				// 	color: 'success',
-				// 	plain: true
-				// },
-			],
-		};
-	},
-	created() {
-		this.getDict()
-	},
-	methods: {
-		// 获取下拉框
-    async getDict() {
-			const res = await getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL)
-			console.log('111', res)
-			this.formConfig[2].selectOptions = res.map(item => {
-				return {
-					id: item.value,
-					name: item.label
-				}
-			})
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.alarmSource = val.name ? val.name : undefined;
-					this.listQuery.alarmGrade = val.alarmGrade ? val.alarmGrade : undefined;
-					if (val.time) {
-						this.listQuery.alarmTime[0] = val.time[0]
-						this.listQuery.alarmTime[1] = val.time[1]
-					} else {
-						this.listQuery.alarmTime = []
-					}
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/base/coreCustomer/add-or-updata.vue

@@ -1,103 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-03 10:53:43
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="客户编号" prop="code">
-					<el-input v-model="dataForm.code" clearable placeholder="请输入客户编号" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="客户名称" prop="name">
-					<el-input v-model="dataForm.name" clearable placeholder="请输入客户名称" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="联系人" prop="contact">
-					<el-input v-model="dataForm.contact" clearable placeholder="请输入联系人" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="联系电话" prop="telephone">
-					<el-input
-						v-model="dataForm.telephone"
-						maxlength="11"
-						placeholder="请输入联系电话" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-form-item label="地址" prop="address">
-			<el-input
-				v-model="dataForm.address"
-				placeholder="请输入地址" />
-		</el-form-item>
-		<el-form-item label="备注" prop="remark">
-			<el-input
-				v-model="dataForm.remark"
-				placeholder="请输入备注" />
-		</el-form-item>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../../core/mixins/basic-add';
-import { createCustomer, updateCustomer, getCustomer, getCode } from "@/api/base/coreCustomer";
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-			  isGetCode: true,
-        codeURL: getCode,
-				createURL: createCustomer,
-				updateURL: updateCustomer,
-				infoURL: getCustomer
-			},
-			dataForm: {
-        id: undefined,
-        code: undefined,
-        name: undefined,
-        telephone: undefined,
-				contact: undefined,
-				address: undefined,
-        remark: undefined
-			},
-			dataRule: {
-        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
-				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
-				telephone: [
-					{ required: false, trigger: "blur", message: "手机号不能为空" },
-          {
-            validator: function (rule, value, callback) {
-              if (value) {
-								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
-									callback(new Error("手机号格式错误"));
-								}
-							} else {
-                callback();
-              }
-            }, trigger: "blur"
-          }
-        ]
-      }
-		};
-	},
-	mounted() {},
-	methods: {}
-};
-</script>

src/views/base/coreCustomer/index.vue

@@ -1,176 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '../../core/mixins/basic-page';
-import { parseTime } from '../../core/mixins/code-filter';
-import {
-	getCustomerPage,
-	deleteCustomer
-} from '@/api/base/coreCustomer';
-
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '添加时间',
-		filter: parseTime
-	},
-	{
-		prop: 'name',
-		label: '客户名称'
-	},
-	{
-		prop: 'code',
-		label: '客户编码'
-	},
-	{
-		prop: 'contact',
-		label: '联系人'
-	},
-	{
-		prop: 'telephone',
-		label: '联系电话'
-	},
-	{
-		prop: 'address',
-		label: '地址'
-	},
-	{
-		prop: 'remark',
-		label: '备注'
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getCustomerPage,
-				deleteURL: deleteCustomer
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:core-customer:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:core-customer:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v)=>v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '名称',
-					placeholder: '专业',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:core-customer:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true
-				},
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {},
-	methods: {
-		// 获取数据列表
-    // getDataList() {
-    //   this.dataListLoading = true;
-    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
-    //     this.tableData = response.data.list;
-    //     this.listQuery.total = response.data.total;
-    //     this.dataListLoading = false;
-    //   });
-    // },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name ? val.name : undefined;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/base/coreDepartment/add-or-updata.vue

@@ -1,107 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-02 14:16:30
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="部门名称" prop="name">
-					<el-input v-model="dataForm.name" clearable placeholder="请输入部门名称" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="部门编码" prop="code">
-					<el-input v-model="dataForm.code" clearable placeholder="请输入部门编码" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="上级部门" prop="parentId">
-					<treeselect v-model="dataForm.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级部门"/>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../../core/mixins/basic-add';
-import { createCoreDepartment, updateCoreDepartment, getCoreDepartment, getCode, getCoreDepartmentList } from "@/api/base/coreDepartment";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-	mixins: [basicAdd],
-	components: { Treeselect },
-	data() {
-		return {
-			urlOptions: {
-			  isGetCode: true,
-        codeURL: getCode,
-				createURL: createCoreDepartment,
-				updateURL: updateCoreDepartment,
-				infoURL: getCoreDepartment,
-			},
-			dataForm: {
-        id: undefined,
-        code: undefined,
-        name: undefined,
-        parentId: undefined,
-        remark: undefined,
-			},
-			departmentlList: [],
-			menuOptions: [],
-			dataRule: {
-        code: [{ required: true, message: "部门编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
-      }
-		};
-	},
-	mounted() {
-		this.getDict()
-	},
-	methods: {
-		async getDict() {
-			// 部门列表
-			this.menuOptions = []
-			const res = await getCoreDepartmentList();
-			this.departmentlList = res.data.map(item => {
-				item.parentId = item.parentId ? item.parentId : 0
-				return item
-			});
-			const menu = { id: 0, name: '总部门', children: [] };
-			menu.children = this.handleTree(this.departmentlList, "id")
-			this.menuOptions.push(menu)
-			console.log('你好', this.menuOptions)
-		},
-		/** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.name,
-        children: node.children
-      };
-    }
-	},
-};
-</script>

src/views/base/coreDepartment/index.vue

@@ -1,168 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '../../core/mixins/basic-page';
-import { parseTime } from '../../core/mixins/code-filter';
-import {
-	getCoreDepartmentPage,
-	deleteCoreDepartment
-} from '@/api/base/coreDepartment';
-
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '添加时间',
-		filter: parseTime
-	},
-	{
-		prop: 'name',
-		label: '部门名称'
-	},
-	{
-		prop: 'code',
-		label: '部门编码'
-	},
-	{
-		prop: 'parentName',
-		label: '上级部门'
-	},
-	{
-		prop: 'remark',
-		label: '备注'
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getCoreDepartmentPage,
-				deleteURL: deleteCoreDepartment
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:core-department:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:core-department:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v)=>v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '部门名',
-					placeholder: '部门名',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:core-department:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true
-				},
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {},
-	methods: {
-		// 获取数据列表
-    // getDataList() {
-    //   this.dataListLoading = true;
-    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
-    //     this.tableData = response.data.list;
-    //     this.listQuery.total = response.data.total;
-    //     this.dataListLoading = false;
-    //   });
-    // },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name ? val.name : undefined;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/base/coreEquipmentLineBind/index.vue

@@ -1,360 +0,0 @@
-<template>
-	<div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
-			@emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
-
-		<!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" />
-
-		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:has-files="false"
-				:rows="rows" />
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
-// import { getAccessToken } from '@/utils/auth';
-
-export default {
-	name: 'EquipmentLineBind',
-	components: {},
-	mixins: [basicPageMixin],
-	data() {
-		return {
-			basePath: '/base/core-equipment-bind-section',
-			searchBarKeys: ['equipmentName', 'productionLineId'],
-			tableBtn: [
-				this.$auth.hasPermi('base:core-equipment-bind-section:update')
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:core-equipment-bind-section:delete')
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v),
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'productionLineName', label: '产线名称' },
-				{ prop: 'workshopSectionName', label: '工段名称' },
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'sort', label: '工段中排序' },
-				{
-					prop: 'lineDataType',
-					label: '产线统计类型',
-					filter: (val) =>
-						val != null ? ['无类型', '进片数量统计', '出片数量统计'][val] : '',
-				},
-				{
-					prop: 'sectionDataType',
-					label: '工段统计类型',
-					filter: (val) =>
-						val != null ? ['无类型', '进片数量统计', '出片数量统计'][val] : '',
-				},
-				// { prop: 'remark', label: '备注' },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'select',
-					label: '产线',
-					placeholder: '请选择产线',
-					param: 'productionLineId',
-					selectOptions: [],
-					filterable: true,
-				},
-				{
-					type: 'input',
-					label: '设备名',
-					placeholder: '请输入设备名称',
-					param: 'equipmentName',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:core-equipment-bind-section:create')
-						? 'button'
-						: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-				// {
-				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						select: true,
-						label: '产线',
-						prop: 'productionLineId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						url: '/base/core-production-line/listAll',
-						bind: { clearable: true, filterable: true },
-						// watch: 'workshopSectionId'
-					},
-					{
-						select: true,
-						label: '工段',
-						prop: 'workshopSectionId',
-						depends: 'productionLineId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: { clearable: true, filterable: true },
-						url: '/base/core-workshop-section/listByParentId',
-					},
-				],
-				[
-					{
-						select: true,
-						label: '设备',
-						prop: 'equipmentId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: { clearable: true, filterable: true },
-						url: '/base/core-equipment/listAll',
-					},
-					{
-						input: true,
-						label: '工段排序',
-						prop: 'sort',
-					},
-				],
-				[
-					{
-						select: true,
-						options: [
-							{ label: '无类型', value: 0 },
-							{ label: '进片数量统计', value: 1 },
-							{ label: '出片数量统计', value: 2 },
-						],
-						label: '产线统计类型',
-						prop: 'lineDataType',
-					},
-					{
-						select: true,
-						options: [
-							{ label: '无类型', value: 0 },
-							{ label: '进片数量统计', value: 1 },
-							{ label: '出片数量统计', value: 2 },
-						],
-						label: '工段统计类型',
-						prop: 'sectionDataType',
-					},
-				],
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				equipmentName: null,
-				productionLineId: null,
-			},
-			// 表单参数
-			form: {},
-		};
-	},
-	created() {
-		this.initSearchOptions();
-		this.getList();
-	},
-	methods: {
-		/** 初始化查询条件 */
-		async initSearchOptions() {
-			this.http('/base/core-production-line/listAll', 'get').then(
-				({ code, data }) => {
-					if (code == 0) {
-						this.searchBarFormConfig[0].selectOptions = data.map((item) => {
-							return {
-								name: item.name,
-								id: item.id,
-							};
-						});
-					}
-				}
-			);
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			this.recv(this.queryParams).then(({ code, data }) => {
-				// if (code == 0) {
-				this.list = data.list;
-				this.total = data.total;
-				this.loading = false;
-				// }
-			});
-			// .catch(err => {
-			// 	this.list = [];
-			// 	this.total = 0;
-			// 	this.loading = false;
-			// })
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				productionLineId: undefined,
-				// 工段
-				workshopSectionId: undefined,
-				// 设备
-				equipmentId: undefined,
-				// 工段排序
-				sort: undefined,
-				// 产线统计类型
-				lineDataType: undefined,
-				// 工段统计类型
-				sectionDataType: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备工段绑定';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			this.info({ id }).then(({ code, data }) => {
-				this.form = data;
-				this.open = true;
-				this.title = '修改设备工段绑定';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					this.put(this.form).then(({ code, data }) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				this.post(this.form).then(({ code, data }) => {
-					this.$modal.msgSuccess('修改成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除绑定"' + row.name + '"?')
-				.then(function () {
-					return deleteEquipmentType(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备工段绑定?')
-				.then(() => {
-					this.exportLoading = true;
-					// return exportEquipmentTypeExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备工段绑定.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
-};
-</script>

src/views/base/coreMajor/add-or-updata.vue

@@ -1,77 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-02 14:24:12
- * @Description:
--->
-<template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="专业编号" prop="code">
-					<el-input v-model="dataForm.code" clearable placeholder="请输入专业编号" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="专业名称" prop="name">
-					<el-input v-model="dataForm.name" clearable placeholder="请输入专业名称" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="缩写" prop="abbreviation">
-					<el-input v-model="dataForm.abbreviation" clearable placeholder="请输入缩写" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="dataForm.remark"
-						placeholder="请输入备注" />
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
-</template>
-
-<script>
-import basicAdd from '../../core/mixins/basic-add';
-import { createCoreMajor, updateCoreMajor, getCoreMajor, getCode } from "@/api/base/coreMajor";
-
-export default {
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-			  isGetCode: true,
-        codeURL: getCode,
-				createURL: createCoreMajor,
-				updateURL: updateCoreMajor,
-				infoURL: getCoreMajor,
-			},
-			dataForm: {
-        id: undefined,
-        code: undefined,
-        name: undefined,
-        abbreviation: undefined,
-        remark: undefined,
-			},
-			departmentlList: [],
-			menuOptions: [],
-			dataRule: {
-        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }]
-      }
-		};
-	},
-	mounted() {},
-	methods: {}
-};
-</script>

src/views/base/coreMajor/index.vue

@@ -1,168 +0,0 @@
-<template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			v-loading="dataListLoading"
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-data="tableData">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
-	</div>
-</template>
-
-<script>
-import AddOrUpdate from './add-or-updata';
-import basicPage from '../../core/mixins/basic-page';
-import { parseTime } from '../../core/mixins/code-filter';
-import {
-	getCoreMajorPage,
-	deleteCoreMajor
-} from '@/api/base/coreMajor';
-
-const tableProps = [
-	{
-		prop: 'createTime',
-		label: '添加时间',
-		filter: parseTime
-	},
-	{
-		prop: 'code',
-		label: '专业编码'
-	},
-	{
-		prop: 'name',
-		label: '专业名称'
-	},
-	{
-		prop: 'abbreviation',
-		label: '缩写'
-	},
-	{
-		prop: 'remark',
-		label: '备注'
-	},
-];
-
-export default {
-	mixins: [basicPage],
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getCoreMajorPage,
-				deleteURL: deleteCoreMajor
-			},
-			tableProps,
-			tableBtn: [
-				this.$auth.hasPermi(`base:core-major:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:core-major:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v)=>v),
-			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
-					label: '名称',
-					placeholder: '专业',
-					param: 'name',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: this.$auth.hasPermi('base:core-major:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true
-				},
-			],
-		};
-	},
-	components: {
-		AddOrUpdate,
-	},
-	created() {},
-	methods: {
-		// 获取数据列表
-    // getDataList() {
-    //   this.dataListLoading = true;
-    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
-    //     this.tableData = response.data.list;
-    //     this.listQuery.total = response.data.total;
-    //     this.dataListLoading = false;
-    //   });
-    // },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.listQuery.name = val.name ? val.name : undefined;
-					this.getDataList();
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 10,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-	},
-};
-</script>

src/views/base/coreProduct/SmallTitle.vue

@@ -1,65 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 15:27:31
- * @LastEditors: zwq
- * @LastEditTime: 2023-08-01 16:25:54
- * @Description:
--->
-<template>
-	<div :class="[className, { 'p-0': noPadding }]">
-		<slot />
-	</div>
-</template>
-
-<script>
-export default {
-	props: {
-		size: {
-			// 取值范围:  xl lg md sm
-			type: String,
-			default: 'de',
-			validator: function (val) {
-				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
-			},
-		},
-		noPadding: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		className: function () {
-			return `${this.size}-title`;
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
-$mgr: 8px;
-@each $size, $height in $pxls {
-	.#{$size}-title {
-		font-size: 18px;
-		line-height: $height;
-		color: #000;
-		font-weight: 500;
-		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
-
-		&::before {
-			content: '';
-			display: inline-block;
-			vertical-align: top;
-			width: 4px;
-			height: $height + 2px;
-			border-radius: 1px;
-			margin-right: $mgr;
-			background-color: #0b58ff;
-		}
-	}
-}
-
-.p-0 {
-	padding: 0;
-}
-</style>