diff --git a/.env.dev b/.env.dev index 2f15db72..1da25e71 100644 --- a/.env.dev +++ b/.env.dev @@ -1,21 +1,29 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-10-16 09:22:52 + # @LastEditTime: 2023-11-21 10:36:47 # @LastEditors: DY - # @Description: -### + # @Description: +### # 开发环境配置 ENV = 'development' # 页面标题 -VUE_APP_TITLE = 产线监控系统 +VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 -# 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.0.33:48080' -# VUE_APP_BASE_API = 'http://192.168.1.188:48080' +# 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:48082' +# VUE_APP_BASE_API = 'http://192.168.1.8:48082' +# VUE_APP_BASE_API = 'http://192.168.4.159:48080' +# VUE_APP_BASE_API = 'http://192.168.1.56:48082' +# VUE_APP_BASE_API = 'http://192.168.4.159:48080' + +# 积木报表指向地址 +VUE_APP_JIMU_API = 'http://192.168.0.33:48082' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true @@ -23,11 +31,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = true # 百度统计 # VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab + diff --git a/.env.front b/.env.front index 34f878c2..d1645075 100644 --- a/.env.front +++ b/.env.front @@ -1,3 +1,4 @@ + # 开发环境配置 ENV = 'development' @@ -13,9 +14,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = true diff --git a/.env.prod b/.env.prod index 7ac2b7f1..8526c196 100644 --- a/.env.prod +++ b/.env.prod @@ -1,15 +1,26 @@ +### + # @Author: zhp + # @Date: 2023-11-07 19:11:40 + # @LastEditTime: 2023-11-16 16:40:59 + # @LastEditors: zhp + # @Description: +### # 生产环境配置 ENV = 'production' # 页面标题 -VUE_APP_TITLE = 产线监控系统 +VUE_APP_TITLE = MES系统 # 芋道管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' +# 积木报表指向地址 +VUE_APP_JIMU_API = 'http://192.168.0.33:48082' + + # 根据服务器或域名修改 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/' -PUBLIC_PATH = 'http://192.168.0.33:8888/' +PUBLIC_PATH = 'http://192.168.0.33:8889/' # 二级部署路径 VUE_APP_APP_NAME ='yudao-admin' @@ -17,9 +28,6 @@ VUE_APP_APP_NAME ='yudao-admin' # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = false diff --git a/.env.production b/.env.production new file mode 100644 index 00000000..a64ca0bb --- /dev/null +++ b/.env.production @@ -0,0 +1,12 @@ +### + # @Author: zhp + # @Date: 2023-10-30 14:18:30 + # @LastEditTime: 2023-11-02 16:16:09 + # @LastEditors: zhp + # @Description: +### +# just a flag +ENV = 'production' + +# base api +# VUE_APP_BASE_API = '/api' diff --git a/.env.stage b/.env.stage index 3602a9b9..763cc8b5 100644 --- a/.env.stage +++ b/.env.stage @@ -15,11 +15,9 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/' # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = false # 百度统计 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab + diff --git a/.env.static b/.env.static index 35e7a28e..bdb29f8f 100644 --- a/.env.static +++ b/.env.static @@ -17,9 +17,6 @@ VUE_APP_APP_NAME ='/admin-ui-vue2/' # 多租户的开关 VUE_APP_TENANT_ENABLE = true -# 验证码的开关 -VUE_APP_CAPTCHA_ENABLE = true - # 文档的开关 VUE_APP_DOC_ENABLE = true diff --git a/package.json b/package.json index 08d55ea0..abeb01a6 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "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", @@ -70,6 +71,7 @@ "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", diff --git a/public/favicon.ico b/public/favicon.ico index e3bdd359..47918ab0 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/static/videos/login.webm b/public/static/videos/login.webm new file mode 100644 index 00000000..18203c39 Binary files /dev/null and b/public/static/videos/login.webm differ diff --git a/src/api/base/coreAlarmLog.js b/src/api/base/coreAlarmLog.js new file mode 100644 index 00000000..c92b30c5 --- /dev/null +++ b/src/api/base/coreAlarmLog.js @@ -0,0 +1,60 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/coreCustomer.js b/src/api/base/coreCustomer.js new file mode 100644 index 00000000..b27ffdf0 --- /dev/null +++ b/src/api/base/coreCustomer.js @@ -0,0 +1,68 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/coreDepartment.js b/src/api/base/coreDepartment.js new file mode 100644 index 00000000..5e452bc2 --- /dev/null +++ b/src/api/base/coreDepartment.js @@ -0,0 +1,68 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/coreHotMaterial.js b/src/api/base/coreHotMaterial.js new file mode 100644 index 00000000..3610dc78 --- /dev/null +++ b/src/api/base/coreHotMaterial.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-15 15:56:14 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建原料 +export function createHotMaterial(data) { + return request({ + url: '/base/core-hot-material/create', + method: 'post', + data: data + }) +} + +// 更新原料 +export function updateHotMaterial(data) { + return request({ + url: '/base/core-hot-material/update', + method: 'put', + data: data + }) +} + +// 删除原料 +export function deleteHotMaterial(id) { + return request({ + url: '/base/core-hot-material/delete?id=' + id, + method: 'delete' + }) +} + +// 获得原料 +export function getHotMaterial(id) { + return request({ + url: '/base/core-hot-material/get?id=' + id, + method: 'get' + }) +} + +// 获得原料code +export function getCode() { + return request({ + url: '/base/core-hot-material/getCode', + method: 'get' + }) +} + +// 获得原料分页 +export function getHotMaterialPage(query) { + return request({ + url: '/base/core-hot-material/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getHotMaterialList(query) { + return request({ + url: '/base/core-hot-material/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreMajor.js b/src/api/base/coreMajor.js new file mode 100644 index 00000000..3ffad226 --- /dev/null +++ b/src/api/base/coreMajor.js @@ -0,0 +1,68 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/coreProduct.js b/src/api/base/coreProduct.js new file mode 100644 index 00000000..476a60b5 --- /dev/null +++ b/src/api/base/coreProduct.js @@ -0,0 +1,111 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/coreProductionLine.js b/src/api/base/coreProductionLine.js new file mode 100644 index 00000000..f3e76b7d --- /dev/null +++ b/src/api/base/coreProductionLine.js @@ -0,0 +1,68 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/coreSupplier.js b/src/api/base/coreSupplier.js new file mode 100644 index 00000000..390b2d59 --- /dev/null +++ b/src/api/base/coreSupplier.js @@ -0,0 +1,68 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/coreWorkOrder.js b/src/api/base/coreWorkOrder.js new file mode 100644 index 00000000..656d4a69 --- /dev/null +++ b/src/api/base/coreWorkOrder.js @@ -0,0 +1,155 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-15 17:19:19 + * @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 + }) +} + +// 根据工单id获得所有列表 +export function getCoreWOListById(ids) { + return request({ + url: '/base/core-work-order/list?ids='+ ids , + method: 'get' + }) +} + +// 创建工单预使用原料 +export function createCoreWOMa(data) { + return request({ + url: '/base/core-work-order-material/create', + method: 'post', + data: data + }) +} + +// 更新工单预使用原料 +export function updateCoreWOMa(data) { + return request({ + url: '/base/core-work-order-material/update', + method: 'put', + data: data + }) +} + +// 删除工单预使用原料 +export function deleteCoreWOMa(id) { + return request({ + url: '/base/core-work-order-material/delete?id=' + id, + method: 'delete' + }) +} + +// 获得工单预使用原料 +export function getCoreWOMa(id) { + return request({ + url: '/base/core-work-order-material/get?id=' + id, + method: 'get' + }) +} + +// 获得工单预使用原料分页 +export function getCoreWOMaPage(query) { + return request({ + url: '/base/core-work-order-material/page', + method: 'get', + params: query + }) +} + +// 获得预计用料信息分页 +export function getMaterialBomPage(query) { + return request({ + url: '/base/material-product-bom/bomUseNum', + method: 'get', + params: query + }) +} + +// 获得订单分页 +export function getConOrderList(query) { + return request({ + url: '/base/order/listConOrder', + method: 'get', + params: query + }) +} + +// 改变工单状态 激活暂停完成作废 +export function statusChange(data) { + return request({ + url: '/base/core-work-order/statusChange', + method: 'post', + data: data + }) +} + +// 创建分配产量 +export function createConCoreWOr(data) { + return request({ + url: '/base/core-order-con-work-order/create', + method: 'post', + data: data + }) +} diff --git a/src/api/base/coreWorker.js b/src/api/base/coreWorker.js new file mode 100644 index 00000000..823302bc --- /dev/null +++ b/src/api/base/coreWorker.js @@ -0,0 +1,103 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/coreWorkshopSection.js b/src/api/base/coreWorkshopSection.js new file mode 100644 index 00000000..9ae8e3ea --- /dev/null +++ b/src/api/base/coreWorkshopSection.js @@ -0,0 +1,68 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/customer.js b/src/api/base/customer.js new file mode 100644 index 00000000..3408429d --- /dev/null +++ b/src/api/base/customer.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +// 获得所有客户列表 +export function getCustomerList() { + return request({ + url: '/base/core-customer/listAll', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/api/base/delivery.js b/src/api/base/delivery.js new file mode 100644 index 00000000..d04fd210 --- /dev/null +++ b/src/api/base/delivery.js @@ -0,0 +1,100 @@ +// 成品发货 +import request from '@/utils/request' +// 获得成品发货清单分页 +export function deliveryLogPage(data) { + return request({ + url: '/extend/delivery-log/page', + method: 'post', + data: data + }) +} + +// 获取发货进度分页 +export function deliveryProgressPage(data) { + return request({ + url: '/extend/delivery-progress/page', + method: 'post', + data: data + }) +} + +// 获取订单列表 +export function listOrderList(query) { + return request({ + url: '/extend/delivery-log/listOrderList', + method: 'get', + params: query + }) +} + +// 获取发货进度分页 +export function deliveryLogDetPage(data) { + return request({ + url: '/extend/delivery-log-det/page', + method: 'post', + data: data + }) +} + +// 创建成品发货清单 +export function deliveryLogCreate(data) { + return request({ + url: '/extend/delivery-log/create', + method: 'post', + data: data + }) +} + +// 更新成品发货清单 +export function deliveryLogUpdate(data) { + return request({ + url: '/extend/delivery-log/update', + method: 'put', + data: data + }) +} + +// 获得成品发货清单 +export function getDeliveryLog(query) { + return request({ + url: '/extend/delivery-log/get', + method: 'get', + params: query + }) +} + +// 删除成品发货清单 +export function deliveryLogDelete(query) { + return request({ + url: '/extend/delivery-log/delete', + method: 'delete', + params: query + }) +} + +// 装车 +export function deliveryLogDetCreate(data) { + return request({ + url: '/extend/delivery-log-det/create', + method: 'post', + data: data + }) +} + +// 获得一条发货详细 +export function deliveryLogDetGet(query) { + return request({ + url: '/extend/delivery-log-det/get', + method: 'get', + params: query + }) +} + +// 编辑发货详情 +export function deliveryLogDetUpdate(data) { + return request({ + url: '/extend/delivery-log-det/update', + method: 'put', + data: data + }) +} diff --git a/src/api/base/equipment.js b/src/api/base/equipment.js index 8c1b4246..6fb31456 100644 --- a/src/api/base/equipment.js +++ b/src/api/base/equipment.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 创建设备 export function createEquipment(data) { return request({ - url: '/base/equipment/create', + url: '/base/core-equipment/create', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function createEquipment(data) { // 更新设备 export function updateEquipment(data) { return request({ - url: '/base/equipment/update', + url: '/base/core-equipment/update', method: 'put', data: data }) @@ -21,7 +21,7 @@ export function updateEquipment(data) { // 删除设备 export function deleteEquipment(id) { return request({ - url: '/base/equipment/delete?id=' + id, + url: '/base/core-equipment/delete?id=' + id, method: 'delete' }) } @@ -29,7 +29,7 @@ export function deleteEquipment(id) { // 获得设备 export function getEquipment(id) { return request({ - url: '/base/equipment/get?id=' + id, + url: '/base/core-equipment/get?id=' + id, method: 'get' }) } @@ -37,7 +37,7 @@ export function getEquipment(id) { // 获得设备分页 export function getEquipmentPage(query) { return request({ - url: '/base/equipment/page', + url: '/base/core-equipment/page', method: 'get', params: query }) @@ -46,7 +46,7 @@ export function getEquipmentPage(query) { // 导出设备 Excel export function exportEquipmentExcel(query) { return request({ - url: '/base/equipment/export-excel', + url: '/base/core-equipment/export-excel', method: 'get', params: query, responseType: 'blob' @@ -55,7 +55,7 @@ export function exportEquipmentExcel(query) { // 获得所有设备列表 export function getEquipmentAll() { return request({ - url: '/base/equipment/listAll', + url: '/base/core-equipment/listAll', method: 'get' }) } diff --git a/src/api/base/equipmentType.js b/src/api/base/equipmentType.js index 57e7746a..3783fbdb 100644 --- a/src/api/base/equipmentType.js +++ b/src/api/base/equipmentType.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 创建设备类型 export function createEquipmentType(data) { return request({ - url: '/base/equipment-type/create', + url: '/base/core-equipment-type/create', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function createEquipmentType(data) { // 更新设备类型 export function updateEquipmentType(data) { return request({ - url: '/base/equipment-type/update', + url: '/base/core-equipment-type/update', method: 'put', data: data }) @@ -21,7 +21,7 @@ export function updateEquipmentType(data) { // 删除设备类型 export function deleteEquipmentType(id) { return request({ - url: '/base/equipment-type/delete?id=' + id, + url: '/base/core-equipment-type/delete?id=' + id, method: 'delete' }) } @@ -29,7 +29,7 @@ export function deleteEquipmentType(id) { // 获得设备类型 export function getEquipmentType(id) { return request({ - url: '/base/equipment-type/get?id=' + id, + url: '/base/core-equipment-type/get?id=' + id, method: 'get' }) } @@ -37,7 +37,7 @@ export function getEquipmentType(id) { // 获得设备类型分页 export function getEquipmentTypePage(query) { return request({ - url: '/base/equipment-type/page', + url: '/base/core-equipment-type/page', method: 'get', params: query }) @@ -46,7 +46,7 @@ export function getEquipmentTypePage(query) { // 导出设备类型 Excel export function exportEquipmentTypeExcel(query) { return request({ - url: '/base/equipment-type/export-excel', + url: '/base/core-equipment-type/export-excel', method: 'get', params: query, responseType: 'blob' diff --git a/src/api/base/factory.js b/src/api/base/factory.js index 76829191..6597ec2d 100644 --- a/src/api/base/factory.js +++ b/src/api/base/factory.js @@ -2,7 +2,7 @@ import request from '@/utils/request' // 获得工厂产线工段设备树形结构 export function getTree() { return request({ - url: '/base/factory/getTree', + url: '/base/core-factory/getTree', method: 'get' }) } \ No newline at end of file diff --git a/src/api/base/groupTeam.js b/src/api/base/groupTeam.js index 04a3ca19..32d752aa 100644 --- a/src/api/base/groupTeam.js +++ b/src/api/base/groupTeam.js @@ -58,3 +58,49 @@ export function listEnabled() { method: 'get' }) } + +// 获得班组组员信息分页 +export function groupTeamPage(query) { + return request({ + url: '/base/group-team-det/page', + method: 'get', + params: query + }) +} + +// 获得班组组员信息 +export function groupTeamDet(query) { + return request({ + url: '/base/group-team-det/get', + method: 'get', + params: query + }) +} + + +// 创建班组组员信息 +export function teamDetCreate(data) { + return request({ + url: '/base/group-team-det/create', + method: 'post', + data: data + }) +} + +// 更新班组组员信息 +export function teamDetUpdate(data) { + return request({ + url: '/base/group-team-det/update', + method: 'put', + data: data + }) +} + +// 删除班组组员信息 +export function teamDetDelete(query) { + return request({ + url: '/base/group-team-det/delete', + method: 'delete', + params: query + }) +} diff --git a/src/api/base/groupTeamScheduling.js b/src/api/base/groupTeamScheduling.js index 95e38dd6..be88f707 100644 --- a/src/api/base/groupTeamScheduling.js +++ b/src/api/base/groupTeamScheduling.js @@ -25,4 +25,4 @@ export function autoSet(query) { method: 'get', params: query }) -} \ No newline at end of file +} diff --git a/src/api/base/material.js b/src/api/base/material.js new file mode 100644 index 00000000..26e495a0 --- /dev/null +++ b/src/api/base/material.js @@ -0,0 +1,121 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-24 11:22:28 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建物料 +export function createMaterial(data) { + return request({ + url: '/base/material/create', + method: 'post', + data: data + }) +} + +// 更新物料 +export function updateMaterial(data) { + return request({ + url: '/base/material/update', + method: 'put', + data: data + }) +} + +// 删除物料 +export function deleteMaterial(id) { + return request({ + url: '/base/material/delete?id=' + id, + method: 'delete' + }) +} + +// 获得物料 +export function getMaterial(id) { + return request({ + url: '/base/material/get?id=' + id, + method: 'get' + }) +} + +// 获得物料code +export function getCode() { + return request({ + url: '/base/material/getMaterialCode', + method: 'get' + }) +} + +// 获得物料分页 +export function getMaterialPage(query) { + return request({ + url: '/base/material/page', + method: 'get', + params: query + }) +} + +// 获得物料列表 +export function getMaterialList(query) { + return request({ + url: '/base/material/listbyfilter', + method: 'get', + params: query + }) +} + +// 获得供应商所有列表 +export function getSupplierList(query) { + return request({ + url: '/base/core-supplier/listAll', + method: 'get', + params: query + }) +} + +// 获得物料属性列表 +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 + }) +} \ No newline at end of file diff --git a/src/api/base/materialDate.js b/src/api/base/materialDate.js new file mode 100644 index 00000000..9c2782cb --- /dev/null +++ b/src/api/base/materialDate.js @@ -0,0 +1,68 @@ +/* + * @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 + }) +} \ No newline at end of file diff --git a/src/api/base/materialProductBom.js b/src/api/base/materialProductBom.js new file mode 100644 index 00000000..4721ab2a --- /dev/null +++ b/src/api/base/materialProductBom.js @@ -0,0 +1,120 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-27 17:54:28 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建产品Bom +export function createMaterialPB(data) { + return request({ + url: '/base/material-product-bom/create', + method: 'post', + data: data + }) +} + +// 更新产品Bom +export function updateMaterialPB(data) { + return request({ + url: '/base/material-product-bom/update', + method: 'put', + data: data + }) +} + +// 删除产品Bom +export function deleteMaterialPB(id) { + return request({ + url: '/base/material-product-bom/delete?id=' + id, + method: 'delete' + }) +} + +// 获得产品Bom +export function getMaterialPB(id) { + return request({ + url: '/base/material-product-bom/get?id=' + id, + method: 'get' + }) +} + +// 获得产品Bomcode +export function getCode() { + return request({ + url: '/base/material-product-bom/getMaterialProductBomCode', + method: 'get' + }) +} + +// 获得产品Bom分页 +export function getMaterialPBPage(query) { + return request({ + url: '/base/material-product-bom/page', + method: 'get', + params: query + }) +} + +// 获得产品Bom列表 +export function getMaterialPBList(query) { + return request({ + url: '/base/material-product-bom/listbyfilter', + method: 'get', + params: query + }) +} + +// 获得产品列表 +export function getProList(query) { + return request({ + url: '/base/core-product/listAll', + method: 'get', + params: query + }) +} + +// 获得产品Bom详细分页 +export function getProBomList(query) { + return request({ + url: '/base/material-product-bom-det/page', + method: 'get', + params: query + }) +} + +// 创建产品Bom详细 +export function createMaterialPBDet(data) { + return request({ + url: '/base/material-product-bom-det/create', + method: 'post', + data: data + }) +} + +// 更新产品Bom详细 +export function updateMaterialPBDet(data) { + return request({ + url: '/base/material-product-bom-det/update', + method: 'put', + data: data + }) +} + +// 删除产品Bom详细 +export function deleteMaterialPBDet(id) { + return request({ + url: '/base/material-product-bom-det/delete?id=' + id, + method: 'delete' + }) +} + +// 获得产品Bom详细 +export function getMaterialPBDet(id) { + return request({ + url: '/base/material-product-bom-det/get?id=' + id, + method: 'get' + }) +} diff --git a/src/api/base/materialUseLog.js b/src/api/base/materialUseLog.js new file mode 100644 index 00000000..3497c071 --- /dev/null +++ b/src/api/base/materialUseLog.js @@ -0,0 +1,69 @@ +/* + * @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' + }) +} diff --git a/src/api/base/modelType.js b/src/api/base/modelType.js new file mode 100644 index 00000000..41389bcd --- /dev/null +++ b/src/api/base/modelType.js @@ -0,0 +1,68 @@ +/* + * @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' + }) +} diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js new file mode 100644 index 00000000..9933c9b7 --- /dev/null +++ b/src/api/base/orderManage.js @@ -0,0 +1,158 @@ +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 + }) +} + +// 获取订单绑定的工单和数量信息，可传订单id列表，map索引为订单id +export function orderAssignmentList(query) { + return request({ + url: '/base/order/orderAssignmentList', + method: 'get', + params: query + }) +} + +// 获得所有客户列表 +export function customerList() { + return request({ + url: '/base/core-customer/listAll', + method: 'get' + }) +} + +// 获得订单详情 +export function orderDetail(query) { + return request({ + url: '/base/order/getDetail', + method: 'get', + params: query + }) +} + +// 产品bom消耗信息 +export function bomUseNum(query) { + return request({ + url: '/base/material-product-bom/bomUseNum', + method: 'get', + params: query + }) +} + +// 完成订单 +export function orderFinish(query) { + return request({ + url: '/base/order/finish', + method: 'post', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/packingInfo.js b/src/api/base/packingInfo.js new file mode 100644 index 00000000..468c2aa6 --- /dev/null +++ b/src/api/base/packingInfo.js @@ -0,0 +1,92 @@ +/* + * @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, + }) +} diff --git a/src/api/base/printModel.js b/src/api/base/printModel.js new file mode 100644 index 00000000..cb047d8f --- /dev/null +++ b/src/api/base/printModel.js @@ -0,0 +1,92 @@ +/* + * @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, + }) +} diff --git a/src/api/base/product.js b/src/api/base/product.js new file mode 100644 index 00000000..4956018b --- /dev/null +++ b/src/api/base/product.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +// 获得产品列表 +export function getProductAll() { + return request({ + url: '/base/core-product/listAll', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/api/base/productionLine.js b/src/api/base/productionLine.js index 7fade9c9..add39173 100644 --- a/src/api/base/productionLine.js +++ b/src/api/base/productionLine.js @@ -2,7 +2,7 @@ import request from '@/utils/request' // 获得所有工厂产线列表 export function getLineAll() { return request({ - url: '/base/production-line/listAll', + url: '/base/core-production-line/listAll', method: 'get' }) } \ No newline at end of file diff --git a/src/api/base/qualityInspectionDet.js b/src/api/base/qualityInspectionDet.js index 7253f7fa..829a9d09 100644 --- a/src/api/base/qualityInspectionDet.js +++ b/src/api/base/qualityInspectionDet.js @@ -1,3 +1,10 @@ +/* + * @Author: zhp + * @Date: 2023-10-17 09:26:38 + * @LastEditTime: 2023-11-20 15:50:08 + * @LastEditors: zhp + * @Description: + */ import request from '@/utils/request' // 创建质量检测信息基础 @@ -52,3 +59,11 @@ export function exportQualityInspectionDetExcel(query) { responseType: 'blob' }) } + +export function getQualityInspectionDetList(query) { + return request({ + url: '/base/quality-inspection-det/listAll', + method: 'get', + params: query + }) +} diff --git a/src/api/base/qualityScrapDet.js b/src/api/base/qualityScrapDet.js new file mode 100644 index 00000000..1cf724ac --- /dev/null +++ b/src/api/base/qualityScrapDet.js @@ -0,0 +1,69 @@ +/* + * @Author: zhp + * @Date: 2023-11-06 15:38:12 + * @LastEditTime: 2023-11-06 15:39:39 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 创建质量检测类型基础 +export function createQualityScrapDet(data) { + return request({ + url: '/base/quality-scrap-det/create', + method: 'post', + data: data + }) +} + +// 更新质量检测类型基础 +export function updateQualityScrapDet(data) { + return request({ + url: '/base/quality-scrap-det/update', + method: 'put', + data: data + }) +} + +// 删除质量检测类型基础 +export function deleteQualityScrapDet(id) { + return request({ + url: '/base/quality-scrap-det/delete?id=' + id, + method: 'delete' + }) +} + +// 获得质量检测类型基础 +export function getQualityScrapDet(id) { + return request({ + url: '/base/quality-scrap-det/get?id=' + id, + method: 'get' + }) +} + +// 获得质量检测类型基础分页 +export function getQualityScrapDetPage(query) { + return request({ + url: '/base/quality-scrap-det/page', + method: 'get', + params: query + }) +} + +// 导出质量检测类型基础 Excel +export function exportQualityScrapTypeExcel(query) { + return request({ + url: '/base/quality-scrap-type/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +export function getCode(query) { + return request({ + url: '/base/quality-scrap-det/getCode', + method: 'get', + params: query + }) +} diff --git a/src/api/base/qualityScrapLog.js b/src/api/base/qualityScrapLog.js new file mode 100644 index 00000000..f0bdaa69 --- /dev/null +++ b/src/api/base/qualityScrapLog.js @@ -0,0 +1,100 @@ +/* + * @Author: zhp + * @Date: 2023-11-07 15:02:37 + * @LastEditTime: 2023-11-07 18:32:07 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 创建质量检测类型基础 +export function createQualityScrapLog(data) { + return request({ + url: '/base/quality-scrap-log/create', + method: 'post', + data: data + }) +} + +// 更新质量检测类型基础 +export function updateQualityScrapLog(data) { + return request({ + url: '/base/quality-scrap-log/update', + method: 'put', + data: data + }) +} + +// 删除质量检测类型基础 +export function deleteQualityScrapLog(id) { + return request({ + url: '/base/quality-scrap-log/delete?id=' + id, + method: 'delete' + }) +} + +// 获得质量检测类型基础 +export function getQualityScrapLog(id) { + return request({ + url: '/base/quality-scrap-log/get?id=' + id, + method: 'get' + }) +} + +// 获得质量检测类型基础分页 +export function getQualityScrapLogPage(query) { + return request({ + url: '/base/quality-scrap-log/page', + method: 'get', + params: query + }) +} + +// 导出质量检测类型基础 Excel +export function exportQualityScrapTypeExcel(query) { + return request({ + url: '/base/quality-scrap-type/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +export function getCode(query) { + return request({ + url: '/base/quality-scrap-log/getCode', + method: 'get', + params: query + }) +} +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} + +export function getTeamList(query) { + return request({ + url: '/base/group-team/listAll', + method: 'get', + params: query, + }) +} + +export function getLineList(query) { + return request({ + url: '/base/core-production-line/listAll', + method: 'get', + params: query, + }) +} + +export function getDetList(query) { + return request({ + url: '/base/quality-scrap-det/listAll', + method: 'get', + params: query, + }) +} diff --git a/src/api/base/qualityScrapType.js b/src/api/base/qualityScrapType.js new file mode 100644 index 00000000..de7190ff --- /dev/null +++ b/src/api/base/qualityScrapType.js @@ -0,0 +1,76 @@ +/* + * @Author: zhp + * @Date: 2023-11-04 18:27:11 + * @LastEditTime: 2023-11-06 15:55:24 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 创建质量检测类型基础 +export function createQualityScrapType(data) { + return request({ + url: '/base/quality-scrap-type/create', + method: 'post', + data: data + }) +} + +// 更新质量检测类型基础 +export function updateQualityScrapType(data) { + return request({ + url: '/base/quality-scrap-type/update', + method: 'put', + data: data + }) +} + +// 删除质量检测类型基础 +export function deleteQualityScrapType(id) { + return request({ + url: '/base/quality-scrap-type/delete?id=' + id, + method: 'delete' + }) +} + +// 获得质量检测类型基础 +export function getQualityScrapType(id) { + return request({ + url: '/base/quality-scrap-type/get?id=' + id, + method: 'get' + }) +} + +// 获得质量检测类型基础分页 +export function getQualityScrapTypePage(query) { + return request({ + url: '/base/quality-scrap-type/page', + method: 'get', + params: query + }) +} + +// 导出质量检测类型基础 Excel +export function exportQualityScrapTypeExcel(query) { + return request({ + url: '/base/quality-scrap-type/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +export function getCode(query) { + return request({ + url: '/base/quality-scrap-type/getCode', + method: 'get', + params: query + }) +} +export function getList(query) { + return request({ + url: 'base/quality-scrap-type/listAll', + method: 'get', + params: query + }) +} diff --git a/src/api/base/workOrder.js b/src/api/base/workOrder.js new file mode 100644 index 00000000..a7ae35f5 --- /dev/null +++ b/src/api/base/workOrder.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +// 获得工单列表 +export function workOrderList() { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/api/base/worker.js b/src/api/base/worker.js new file mode 100644 index 00000000..67ad7268 --- /dev/null +++ b/src/api/base/worker.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' +// 获得所有员工列表 +export function getWorkerList() { + return request({ + url: '/base/core-worker/listAll', + method: 'get' + }) +} + +// 获得员工 +export function getWorker(query) { + return request({ + url: '/base/core-worker/get', + method: 'get', + params: query + }) +} + +// 获得该班组其他可选组员列表(除去现有组员) +export function otherWorkerList(query) { + return request({ + url: '/base/group-team-det/otherWorkerList', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/workshopSection.js b/src/api/base/workshopSection.js index bf5e65d5..9f3fe108 100644 --- a/src/api/base/workshopSection.js +++ b/src/api/base/workshopSection.js @@ -2,7 +2,7 @@ import request from '@/utils/request' // 获得所有产线工段列表 export function getWorkShopAll() { return request({ - url: '/base/workshop-section/listAll', + url: '/base/core-workshop-section/listAll', method: 'get' }) } \ No newline at end of file diff --git a/src/api/core/analysis/index.js b/src/api/core/analysis/index.js index af791ff5..e5f374e9 100644 --- a/src/api/core/analysis/index.js +++ b/src/api/core/analysis/index.js @@ -1,23 +1,24 @@ /* * @Author: zhp * @Date: 2023-09-12 14:07:04 - * @LastEditTime: 2023-09-13 09:53:45 - * @LastEditors: zhp + * @LastEditTime: 2023-11-10 10:23:43 + * @LastEditors: DY * @Description: */ import request from '@/utils/request' -export function getYieldAnalysisPageData(data) { +export function getYieldAnalysisPageData(query) { return request({ - url: '/analysis/production-analysis/getOutput', - method: 'post', - data: data + url: '/base/core-production-line-rec-day/monthList', + method: 'get', + params: query }) } +// 产线平衡分析 export function getCT(data) { return request({ - url: '/analysis/production-analysis/getCT', + url: '/analysis/equipment-analysis/getCT', method: 'post', data: data }) diff --git a/src/api/core/base/factory.js b/src/api/core/base/factory.js index 8731bb57..42189799 100644 --- a/src/api/core/base/factory.js +++ b/src/api/core/base/factory.js @@ -1,9 +1,16 @@ +/* + * @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/factory/create', + url: '/base/core-factory/create', method: 'post', data: data }) @@ -12,7 +19,7 @@ export function createFactory(data) { // 更新工厂 export function updateFactory(data) { return request({ - url: '/base/factory/update', + url: '/base/core-factory/update', method: 'put', data: data }) @@ -21,7 +28,7 @@ export function updateFactory(data) { // 删除工厂 export function deleteFactory(id) { return request({ - url: '/base/factory/delete?id=' + id, + url: '/base/core-factory/delete?id=' + id, method: 'delete' }) } @@ -29,21 +36,30 @@ export function deleteFactory(id) { // 获得工厂 export function getFactory(id) { return request({ - url: '/base/factory/get?id=' + id, + url: '/base/core-factory/get?id=' + id, method: 'get' }) } // 获得工厂code export function getCode() { return request({ - url: '/base/factory/getCode', + url: '/base/core-factory/getCode', method: 'get' }) } // 获得工厂分页 export function getFactoryPage(query) { return request({ - url: '/base/factory/page', + url: '/base/core-factory/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getFactoryList(query) { + return request({ + url: '/base/core-factory/listAll', method: 'get', params: query }) @@ -52,7 +68,7 @@ export function getFactoryPage(query) { // 导出工厂 Excel export function exportFactoryExcel(query) { return request({ - url: '/base/factory/export-excel', + url: '/base/core-factory/export-excel', method: 'get', params: query, responseType: 'blob' diff --git a/src/api/core/monitoring/data24.js b/src/api/core/monitoring/data24.js index 86afe0d8..0c99f289 100644 --- a/src/api/core/monitoring/data24.js +++ b/src/api/core/monitoring/data24.js @@ -1,17 +1,17 @@ /* * @Author: Do not edit * @Date: 2023-09-12 09:44:53 - * @LastEditTime: 2023-09-15 14:12:26 + * @LastEditTime: 2023-11-06 18:57:05 * @LastEditors: DY * @Description: */ import request from '@/utils/request' // 获得近24小时产线生产数据 -export function getPdlDataOneDay(data) { +export function getPdlDataOneDay(query) { return request({ - url: '/monitoring/production-monitor/getPdlDataOneDay', - method: 'post', - data: data + url: '/base/core-production-line-rec-hour/list24h', + method: 'get', + params: query }) } diff --git a/src/api/equipment/analysis/statistics.js b/src/api/equipment/analysis/statistics.js new file mode 100644 index 00000000..ebd60e17 --- /dev/null +++ b/src/api/equipment/analysis/statistics.js @@ -0,0 +1,27 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-10 09:27:39 + * @LastEditTime: 2023-11-10 09:30:00 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得设备统计分析 +export function getEqAnalysis(query) { + return request({ + url: '/analysis/equipment-analysis/statistics', + method: 'get', + params: query + }) +} + +// 导出设备统计分析 +export function exportEqAnalysisExcel(query) { + return request({ + url: '/analysis/equipment-analysis/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/alarm/records.js b/src/api/equipment/base/alarm/records.js new file mode 100644 index 00000000..8a4104ca --- /dev/null +++ b/src/api/equipment/base/alarm/records.js @@ -0,0 +1,60 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-09 17:42:27 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建设备报警处理 +export function createAlarmHand(data) { + return request({ + url: '/base/equipment-alarm-hand/create', + method: 'post', + data: data + }) +} + +// 更新设备报警处理 +export function updateAlarmHand(data) { + return request({ + url: '/base/equipment-alarm-hand/update', + method: 'put', + data: data + }) +} + +// 删除设备报警处理 +export function deleteAlarmHand(id) { + return request({ + url: '/base/equipment-alarm-hand/delete?id=' + id, + method: 'delete' + }) +} + +//获得设备报警处理 +export function getAlarmHand(id) { + return request({ + url: '/base/equipment-alarm-hand/get?id=' + id, + method: 'get' + }) +} + +// 获得设备报警处理分页 +export function getAlarmHandPage(query) { + return request({ + url: '/base/equipment-alarm-hand/page', + method: 'get', + params: query + }) +} + + +//获得设备报警记录 +export function getAlarmLog(id) { + return request({ + url: '/base/equipment-alarm-log/get?id=' + id, + method: 'get' + }) +} diff --git a/src/api/equipment/base/inspection/record.js b/src/api/equipment/base/inspection/record.js new file mode 100644 index 00000000..31bb481e --- /dev/null +++ b/src/api/equipment/base/inspection/record.js @@ -0,0 +1,70 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-16 20:15:02 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 根据设备获得所有巡检内容列表 +export function getcheckAllList(query) { + return request({ + url: '/base/equipment-check/listAll', + method: 'get', + params: query + }) +} + +// 创建设备巡检计划记录 +export function createCheckLog(data) { + return request({ + url: '/base/equipment-check-log/create', + method: 'post', + data: data + }) +} + +// 更新设备巡检计划记录 +export function updateCheckLog(data) { + return request({ + url: '/base/equipment-check-log/update', + method: 'put', + data: data + }) +} + +// 获得设备巡检计划记录 +export function getEqCheckLog(id) { + return request({ + url: '/base/equipment-check-log/get?id=' + id, + method: 'get' + }) +} + +// 导出设备巡检计划记录 +export function exportCheckLogExcel(query) { + return request({ + url: '/base/equipment-check-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +// 根据设备获得所有巡检配置列表 +export function getcheckConfigByEqList(query) { + return request({ + url: '/base/equipment-check-config/list', + method: 'get', + params: query + }) +} + +// 删除设备巡检记录 +export function deleteEqCheckLog(id) { + return request({ + url: '/base/equipment-check-log/delete?id=' + id, + method: 'delete' + }) +} diff --git a/src/api/equipment/base/inspection/settings.js b/src/api/equipment/base/inspection/settings.js new file mode 100644 index 00000000..5f637a22 --- /dev/null +++ b/src/api/equipment/base/inspection/settings.js @@ -0,0 +1,102 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-25 16:22:49 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得设备巡检设置 +export function getEqCheck(id) { + return request({ + url: '/base/equipment-check-config/get?id=' + id, + method: 'get' + }) +} + +// 创建巡检项目 +export function createCheckDet(data) { + return request({ + url: '/base/equipment-check-config-det/create', + method: 'post', + data: data + }) +} + +// 更新巡检项目 +export function updateCheckDet(data) { + return request({ + url: '/base/equipment-check-config-det/update', + method: 'put', + data: data + }) +} + +// 删除巡检项目 +export function deleteCheckDet(id) { + return request({ + url: '/base/equipment-check-config-det/delete?id=' + id, + method: 'delete' + }) +} + +//巡检项目 +export function getCheckDet(id) { + return request({ + url: '/base/equipment-check-config-det/get?id=' + id, + method: 'get' + }) +} + +// 获得巡检项目分页 +export function getCheckDetPage(query) { + return request({ + url: '/base/equipment-check-config-det/page', + method: 'get', + params: query + }) +} + +// 获得设备巡检所有列表 +export function getcheckList(query) { + return request({ + url: '/base/equipment-check/listAll', + method: 'get', + params: query + }) +} + +// 删除巡检内容 +export function deleteCheck(id) { + return request({ + url: '/base/equipment-check/delete?id=' + id, + method: 'delete' + }) +} + +// 获得设备巡检设置code +export function getCode() { + return request({ + url: '/base/equipment-check-config/getCode', + method: 'get' + }) +} + +// 创建巡检配置 +export function createCheckConfig(data) { + return request({ + url: '/base/equipment-check-config/create', + method: 'post', + data: data + }) +} + +// 更新巡检配置 +export function updateCheckConfig(data) { + return request({ + url: '/base/equipment-check-config/update', + method: 'put', + data: data + }) +} diff --git a/src/api/equipment/base/maintain/record.js b/src/api/equipment/base/maintain/record.js new file mode 100644 index 00000000..8ca6f36f --- /dev/null +++ b/src/api/equipment/base/maintain/record.js @@ -0,0 +1,44 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-23 19:10:07 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 删除设备保养记录 +export function deleteEqMaintainLog(id) { + return request({ + url: '/base/equipment-maintain-log/delete?id=' + id, + method: 'delete' + }) +} + +// 删除设备保养计划配置 +export function deleteEqMaintainPlan(id) { + return request({ + url: '/base/equipment-maintain-plan/delete?id=' + id, + method: 'delete' + }) +} + +// 导出设备保养监控 +export function exportMaintainMonitorExcel(query) { + return request({ + url: '/base/equipment-maintain-plan/monitor-export', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +// 导出设备保养记录 +export function exportMaintainLogExcel(query) { + return request({ + url: '/base/equipment-maintain-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/equipment/base/repair.js b/src/api/equipment/base/repair.js new file mode 100644 index 00000000..79fb191b --- /dev/null +++ b/src/api/equipment/base/repair.js @@ -0,0 +1,43 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-10 16:09:33 + * @LastEditTime: 2023-11-23 20:29:28 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +//获得设备维修 +export function getEqRepair(id) { + return request({ + url: '/base/equipment-repair-log/get?id=' + id, + method: 'get' + }) +} + +// 更新设备维修记录 +export function updateEqRepair(data) { + return request({ + url: '/base/equipment-repair-log/update', + method: 'put', + data: data + }) +} + +// 删除维修记录 +export function deleteRepair(id) { + return request({ + url: '/base/equipment-repair-log/delete?id=' + id, + method: 'delete' + }) +} + +// 导出设备维修 +export function exportRepairLogExcel(query) { + return request({ + url: '/base/equipment-repair-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/equipment/base/spare-parts/config.js b/src/api/equipment/base/spare-parts/config.js new file mode 100644 index 00000000..0abc7f56 --- /dev/null +++ b/src/api/equipment/base/spare-parts/config.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-11 16:18:57 + * @LastEditTime: 2023-11-16 20:52:06 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +//获得备品备件配置 +export function getSparePartConfig(id) { + return request({ + url: '/base/equipment-spare-part-config/get?id=' + id, + method: 'get' + }) +} + +// 创建设备备品备件配置--抽屉 +export function createConfigDet(data) { + return request({ + url: '/base/equipment-spare-part-config-det/create', + method: 'post', + data: data + }) +} + +// 删除设备备品备件配置--抽屉 +export function deleteConfigDet(id) { + return request({ + url: '/base/equipment-spare-part-config-det/delete?id=' + id, + method: 'delete' + }) +} + +// 获得抽屉表格分页 +export function getConfigDetPage(query) { + return request({ + url: '/base/equipment-spare-part-config-det/page', + method: 'get', + params: query + }) +} + +// 获得备品备件列表 +export function getSparePartList(query) { + return request({ + url: '/base/equipment-spare-part/list', + method: 'get', + params: query + }) +} + +// 删除设备备品备件配置 +export function deleteConfig(id) { + return request({ + url: '/base/equipment-spare-part-config/delete?id=' + id, + method: 'delete' + }) +} + +// 获得备品备件分页 +export function getSparePartPage(query) { + return request({ + url: '/base/equipment-spare-part/page', + method: 'get', + params: query + }) +} diff --git a/src/api/equipment/base/spare-parts/list.js b/src/api/equipment/base/spare-parts/list.js new file mode 100644 index 00000000..4408b37b --- /dev/null +++ b/src/api/equipment/base/spare-parts/list.js @@ -0,0 +1,16 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-22 13:59:17 + * @LastEditTime: 2023-11-22 13:59:45 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 删除设备备品备件 +export function deleteSparePart(id) { + return request({ + url: '/base/equipment-spare-part/delete?id=' + id, + method: 'delete' + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/spare-parts/monitor.js b/src/api/equipment/base/spare-parts/monitor.js new file mode 100644 index 00000000..af4f2a42 --- /dev/null +++ b/src/api/equipment/base/spare-parts/monitor.js @@ -0,0 +1,45 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-11 16:18:57 + * @LastEditTime: 2023-11-11 18:44:51 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得抽屉表格分页 +export function getConfigDetMonitorPage(query) { + return request({ + url: '/base/equipment-spare-part-config-det/monitor', + method: 'get', + params: query + }) +} + +// 创建设备备品备件更换log +export function createSparePartLog(data) { + return request({ + url: '/base/equipment-spare-part-log/create', + method: 'post', + data: data + }) +} + +// 获得设备备品备件更换log分页 +export function getSparePartLogPage(query) { + return request({ + url: '/base/equipment-spare-part-log/page', + method: 'get', + params: query + }) +} + +// 导出设备备品备件更换log +export function exportSparePartLogExcel(query) { + return request({ + url: '/base/equipment-spare-part-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/extend/processEquMaterialBom.js b/src/api/extend/processEquMaterialBom.js new file mode 100644 index 00000000..0a01aa7d --- /dev/null +++ b/src/api/extend/processEquMaterialBom.js @@ -0,0 +1,121 @@ +/* + * @Author: zhp + * @Date: 2023-11-07 19:47:48 + * @LastEditTime: 2023-11-23 13:57:41 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得能耗统计查询分页 +export function processEquMaterialBomPage(data) { + return request({ + url: '/extend/process-equ-material-bom/page', + method: 'get', + params: data + }) +} + +export function updateProcessEquMaterialBom(data) { + return request({ + url: '/extend/process-equ-material-bom/update', + method: 'put', + data: data + }) +} + +export function createProcessEquMaterialBom(data) { + return request({ + url: '/extend/process-equ-material-bom/create', + method: 'post', + data: data + }) +} + + +export function getProcessEquMaterialBom(data) { + return request({ + url: '/extend/process-equ-material-bom/get', + method: 'get', + params: data + }) +} + +export function deleteProcessEquMaterialBom(id) { + return request({ + url: '/extend/process-equ-material-bom/delete?id=' + id, + method: 'delete', + // data: data + }) +} + +export function getEquipmentList(data) { + return request({ + url: '/base/core-equipment/listAll', + method: 'get', + data: data + }) +} + +export function deleteProcessEquMaterialBomDet(id) { + return request({ + url: '/extend/process-equ-material-bom-det/delete?id=' + id, + method: 'delete', + // data: data + }) +} + +export function processEquMaterialBomDetPage(data) { + return request({ + url: '/extend/process-equ-material-bom-det/page', + method: 'get', + params: data + }) +} + +export function updateProcessEquMaterialBomDet(data) { + return request({ + url: '/extend/process-equ-material-bom-det/update', + method: 'put', + data: data + }) +} + +export function createProcessEquMaterialBomDet(data) { + return request({ + url: '/extend/process-equ-material-bom-det/create', + method: 'post', + data: data + }) +} + +export function getProcessEquMaterialBomDet(data) { + return request({ + url: '/extend/process-equ-material-bom-det/get', + method: 'get', + params: data + }) +} + +export function getMaterialList(data) { + return request({ + url: '/base/material/listbyfilter', + method: 'get', + data: data + }) +} +export function getMaterialCode(data) { + return request({ + url: '/extend/process-equ-material-bom/getCode', + method: 'get', + params: data + }) +} + +export function createProcessEquMaterialBomDetList(data) { + return request({ + url: '/extend/process-equ-material-bom-det/createByList', + method: 'post', + data: data + }) +} diff --git a/src/api/extend/processEquValueBom.js b/src/api/extend/processEquValueBom.js new file mode 100644 index 00000000..6c9b5067 --- /dev/null +++ b/src/api/extend/processEquValueBom.js @@ -0,0 +1,122 @@ +/* + * @Author: zhp + * @Date: 2023-11-09 09:37:14 + * @LastEditTime: 2023-11-23 14:15:45 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +export function processEquValueBomPage(data) { + return request({ + url: '/extend/process-equ-value-bom/page', + method: 'get', + params: data + }) +} + +export function updateProcessEquValueBom(data) { + return request({ + url: '/extend/process-equ-value-bom/update', + method: 'put', + data: data + }) +} + +export function createProcessEquValueBom(data) { + return request({ + url: '/extend/process-equ-value-bom/create', + method: 'post', + data: data + }) +} + + +export function getProcessEquValueBom(data) { + return request({ + url: '/extend/process-equ-value-bom/get', + method: 'get', + params: data + }) +} + +export function deleteProcessEquValueBom(id) { + return request({ + url: '/extend/process-equ-value-bom/delete?id=' + id, + method: 'delete', + // data: data + }) +} + +export function getEquipmentList(data) { + return request({ + url: '/base/core-equipment/listAll', + method: 'get', + data: data + }) +} + +export function deleteProcessEquValueBomDet(id) { + return request({ + url: '/extend/process-equ-value-bom-det/delete?id=' + id, + method: 'delete', + // data: data + }) +} + +export function processEquValueBomDetPage(data) { + return request({ + url: '/extend/process-equ-value-bom-det/page', + method: 'get', + params: data + }) +} + +export function updateProcessEquValueBomDet(data) { + return request({ + url: '/extend/process-equ-value-bom-det/update', + method: 'put', + data: data + }) +} + +export function createProcessEquValueBomDet(data) { + return request({ + url: '/extend/process-equ-value-bom-det/create', + method: 'post', + data: data + }) +} + +export function getProcessEquValueBomDet(data) { + return request({ + url: '/extend/process-equ-value-bom-det/get', + method: 'get', + params: data + }) +} + +export function getValueList(data) { + return request({ + url: '/extend/process-equ-value-bom-det/getEnableValuesByEquId', + method: 'get', + params: data + }) +} + +export function getValueCode(data) { + return request({ + url: '/extend/process-equ-value-bom/getCode', + method: 'get', + params: data + }) +} + +export function createProcessEquValueBomDetList(data) { + return request({ + url: '/extend/process-equ-value-bom-det/createByList', + method: 'post', + data: data + }) +} diff --git a/src/api/monitoring/groupTeamView.js b/src/api/monitoring/groupTeamView.js new file mode 100644 index 00000000..81cbcd00 --- /dev/null +++ b/src/api/monitoring/groupTeamView.js @@ -0,0 +1,27 @@ +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 + }) +} diff --git a/src/api/monitoring/orderEnergy.js b/src/api/monitoring/orderEnergy.js new file mode 100644 index 00000000..4cb77e30 --- /dev/null +++ b/src/api/monitoring/orderEnergy.js @@ -0,0 +1,19 @@ +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 + }) +} + diff --git a/src/api/monitoring/qualityInspectionRecord.js b/src/api/monitoring/qualityInspectionRecord.js index 81454cc5..acd532c8 100644 --- a/src/api/monitoring/qualityInspectionRecord.js +++ b/src/api/monitoring/qualityInspectionRecord.js @@ -1,9 +1,16 @@ +/* + * @Author: zhp + * @Date: 2023-10-17 09:26:38 + * @LastEditTime: 2023-11-02 17:00:17 + * @LastEditors: zhp + * @Description: + */ import request from '@/utils/request' // 创建质量检查信息记录表 export function createQualityInspectionRecord(data) { return request({ - url: '/monitoring/quality-inspection-record/create', + url: '/base/quality-inspection-record/create', method: 'post', data: data }) @@ -12,7 +19,7 @@ export function createQualityInspectionRecord(data) { // 更新质量检查信息记录表 export function updateQualityInspectionRecord(data) { return request({ - url: '/monitoring/quality-inspection-record/update', + url: '/base/quality-inspection-record/update', method: 'put', data: data }) @@ -21,7 +28,7 @@ export function updateQualityInspectionRecord(data) { // 删除质量检查信息记录表 export function deleteQualityInspectionRecord(id) { return request({ - url: '/monitoring/quality-inspection-record/delete?id=' + id, + url: '/base/quality-inspection-record/delete?id=' + id, method: 'delete' }) } @@ -29,7 +36,7 @@ export function deleteQualityInspectionRecord(id) { // 获得质量检查信息记录表 export function getQualityInspectionRecord(id) { return request({ - url: '/monitoring/quality-inspection-record/get?id=' + id, + url: '/base/quality-inspection-record/get?id=' + id, method: 'get' }) } @@ -37,7 +44,7 @@ export function getQualityInspectionRecord(id) { // 获得质量检查信息记录表分页 export function getQualityInspectionRecordPage(query) { return request({ - url: '/monitoring/quality-inspection-record/page', + url: '/base/quality-inspection-record/page', method: 'get', params: query }) @@ -46,7 +53,7 @@ export function getQualityInspectionRecordPage(query) { // 导出质量检查信息记录表 Excel export function exportQualityInspectionRecordExcel(query) { return request({ - url: '/monitoring/quality-inspection-record/export-excel', + url: '/base/quality-inspection-record/export-excel', method: 'get', params: query, responseType: 'blob' diff --git a/src/api/monitoring/statisticalData.js b/src/api/monitoring/statisticalData.js new file mode 100644 index 00000000..2d0f19be --- /dev/null +++ b/src/api/monitoring/statisticalData.js @@ -0,0 +1,40 @@ +/* + * @Author: zhp + * @Date: 2023-11-07 14:10:18 + * @LastEditTime: 2023-11-16 17:49:52 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得质量检查信息记录表分页 +export function getStatisticalDataPage(query) { + return request({ + url: '/base/statistical-data/getStatisticData', + method: 'get', + params: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +export function getProductList(query) { + return request({ + url: '/base/core-product/listAll', + method: 'get', + params: query, + }) +} + +export function getInspectionData(query) { + return request({ + url: '/base/statistical-data/getInspectionData', + method: 'get', + params: query, + }) +} diff --git a/src/api/monitoring/teamProduction.js b/src/api/monitoring/teamProduction.js new file mode 100644 index 00000000..792d694b --- /dev/null +++ b/src/api/monitoring/teamProduction.js @@ -0,0 +1,28 @@ +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 + }) +} \ No newline at end of file diff --git a/src/api/quality/deviceParameters.js b/src/api/quality/deviceParameters.js new file mode 100644 index 00000000..ae1c87fb --- /dev/null +++ b/src/api/quality/deviceParameters.js @@ -0,0 +1,35 @@ +/* + * @Author: zhp + * @Date: 2023-10-18 09:33:57 + * @LastEditTime: 2023-11-03 09:31:17 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得物料信息追溯page +export function getTreeData(query) { + return request({ + url: '/base/core-factory/getTreeByWorkOrder', + method: 'get', + params: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +// 导出物料信息 +export function exportEnergyPlcExcel(query) { + return request({ + url: '/base/material-use-log/materialTraceExport', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/quality/materialTraceability.js b/src/api/quality/materialTraceability.js new file mode 100644 index 00000000..d8eea07f --- /dev/null +++ b/src/api/quality/materialTraceability.js @@ -0,0 +1,35 @@ +/* + * @Author: zhp + * @Date: 2023-10-18 09:33:57 + * @LastEditTime: 2023-10-31 10:28:51 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得物料信息追溯page +export function getMaterialUseLogPage(query) { + return request({ + url: '/base/material-use-log/materialTrace', + method: 'get', + params: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +// 导出物料信息 +export function exportEnergyPlcExcel(query) { + return request({ + url: '/base/material-use-log/materialTraceExport', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/quality/processTraceability.js b/src/api/quality/processTraceability.js new file mode 100644 index 00000000..5faac726 --- /dev/null +++ b/src/api/quality/processTraceability.js @@ -0,0 +1,43 @@ +/* + * @Author: zhp + * @Date: 2023-10-31 15:05:06 + * @LastEditTime: 2023-11-28 09:28:05 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得工艺信息追溯page +export function getProcessTraceabilityPage(query) { + return request({ + url: '/extend/process-retrospect/get', + method: 'post', + data: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} + +export function getCoreProduct(id) { + return request({ + url: '/base/core-product/get?id=' + id, + method: 'get' + }) +} + +// 导出物料信息 +// export function exportEnergyPlcExcel(query) { +// return request({ +// url: '/base/material-use-log/materialTraceExport', +// method: 'get', +// params: query, +// responseType: 'blob' +// }) +// } diff --git a/src/api/quality/processTraceabilityDetail.js b/src/api/quality/processTraceabilityDetail.js new file mode 100644 index 00000000..55da6791 --- /dev/null +++ b/src/api/quality/processTraceabilityDetail.js @@ -0,0 +1,43 @@ +/* + * @Author: zhp + * @Date: 2023-10-18 09:33:57 + * @LastEditTime: 2023-11-09 15:33:20 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得物料信息追溯page +export function getDetMaterial(query) { + return request({ + url: '/extend/process-retrospect/getDetMaterial', + method: 'post', + data: query + }) +} + +export function getDetValue(query) { + return request({ + url: '/extend/process-retrospect/getDetValue', + method: 'post', + data: query + }) +} + +// export function getWorkOrderList(query) { +// return request({ +// url: '/base/core-work-order/listbyfilter', +// method: 'get', +// params: query, +// }) +// } +// // 导出物料信息 +// export function exportEnergyPlcExcel(query) { +// return request({ +// url: '/base/material-use-log/materialTraceExport', +// method: 'get', +// params: query, +// responseType: 'blob' +// }) +// } diff --git a/src/api/quality/rawMaterialTraceability.js b/src/api/quality/rawMaterialTraceability.js new file mode 100644 index 00000000..aba01790 --- /dev/null +++ b/src/api/quality/rawMaterialTraceability.js @@ -0,0 +1,35 @@ +/* + * @Author: zhp + * @Date: 2023-10-31 10:55:20 + * @LastEditTime: 2023-10-31 15:05:30 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得原料信息追溯page +export function getRawMaterialPage(query) { + return request({ + url: '/base/core-work-order-material/page', + method: 'get', + params: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +// 导出物料信息 +export function exportEnergyPlcExcel(query) { + return request({ + url: '/base/material-use-log/materialTraceExport', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouse-info.js b/src/api/warehouse/warehouse-info.js new file mode 100644 index 00000000..8ac37edf --- /dev/null +++ b/src/api/warehouse/warehouse-info.js @@ -0,0 +1,75 @@ +/* + * @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' + }) +} diff --git a/src/api/warehouse/warehouseGoods.js b/src/api/warehouse/warehouseGoods.js new file mode 100644 index 00000000..1eaae6a7 --- /dev/null +++ b/src/api/warehouse/warehouseGoods.js @@ -0,0 +1,76 @@ +/* + * @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' + }) +} diff --git a/src/api/warehouse/warehouseLocation.js b/src/api/warehouse/warehouseLocation.js new file mode 100644 index 00000000..f1b41f6c --- /dev/null +++ b/src/api/warehouse/warehouseLocation.js @@ -0,0 +1,97 @@ +/* + * @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' + }) +} diff --git a/src/api/warehouse/warehouseRealtime.js b/src/api/warehouse/warehouseRealtime.js new file mode 100644 index 00000000..4ce73e64 --- /dev/null +++ b/src/api/warehouse/warehouseRealtime.js @@ -0,0 +1,83 @@ +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' + }) +} diff --git a/src/api/warehouse/warehouseRealtimeLocation.js b/src/api/warehouse/warehouseRealtimeLocation.js new file mode 100644 index 00000000..af525c30 --- /dev/null +++ b/src/api/warehouse/warehouseRealtimeLocation.js @@ -0,0 +1,85 @@ +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' + }) +} diff --git a/src/assets/icons/svg/exitbtn.svg b/src/assets/icons/svg/exitbtn.svg new file mode 100644 index 00000000..8b8b0eff --- /dev/null +++ b/src/assets/icons/svg/exitbtn.svg @@ -0,0 +1,12 @@ + + + exit + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/helpbtn.svg b/src/assets/icons/svg/helpbtn.svg new file mode 100644 index 00000000..5960b5b3 --- /dev/null +++ b/src/assets/icons/svg/helpbtn.svg @@ -0,0 +1,20 @@ + + + 编组 17 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home.svg b/src/assets/icons/svg/home.svg new file mode 100644 index 00000000..d299a79c --- /dev/null +++ b/src/assets/icons/svg/home.svg @@ -0,0 +1,12 @@ + + + 编组 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/icon-upload.svg b/src/assets/icons/svg/icon-upload.svg new file mode 100644 index 00000000..7c679b07 --- /dev/null +++ b/src/assets/icons/svg/icon-upload.svg @@ -0,0 +1,14 @@ + + + 上传 + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/order-monitoring.svg b/src/assets/icons/svg/order-monitoring.svg new file mode 100644 index 00000000..5960b5b3 --- /dev/null +++ b/src/assets/icons/svg/order-monitoring.svg @@ -0,0 +1,20 @@ + + + 编组 17 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/return.svg b/src/assets/icons/svg/return.svg new file mode 100644 index 00000000..768c0c40 --- /dev/null +++ b/src/assets/icons/svg/return.svg @@ -0,0 +1,14 @@ + + + rollback + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/table_add.svg b/src/assets/icons/svg/table_add.svg new file mode 100644 index 00000000..812dde4b --- /dev/null +++ b/src/assets/icons/svg/table_add.svg @@ -0,0 +1,19 @@ + + + + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/table_delete.svg b/src/assets/icons/svg/table_delete.svg new file mode 100644 index 00000000..518fd2c8 --- /dev/null +++ b/src/assets/icons/svg/table_delete.svg @@ -0,0 +1,15 @@ + + + + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/table_edit.svg b/src/assets/icons/svg/table_edit.svg new file mode 100644 index 00000000..071dadc2 --- /dev/null +++ b/src/assets/icons/svg/table_edit.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/choicepart/Core.png b/src/assets/images/choicepart/Core.png new file mode 100644 index 00000000..f1d1b73d Binary files /dev/null and b/src/assets/images/choicepart/Core.png differ diff --git a/src/assets/images/choicepart/Delivery.png b/src/assets/images/choicepart/Delivery.png new file mode 100644 index 00000000..b0331ade Binary files /dev/null and b/src/assets/images/choicepart/Delivery.png differ diff --git a/src/assets/images/choicepart/Energy.png b/src/assets/images/choicepart/Energy.png new file mode 100644 index 00000000..a6511565 Binary files /dev/null and b/src/assets/images/choicepart/Energy.png differ diff --git a/src/assets/images/choicepart/Equipment.png b/src/assets/images/choicepart/Equipment.png new file mode 100644 index 00000000..763e5396 Binary files /dev/null and b/src/assets/images/choicepart/Equipment.png differ diff --git a/src/assets/images/choicepart/Extend.png b/src/assets/images/choicepart/Extend.png new file mode 100644 index 00000000..ae319647 Binary files /dev/null and b/src/assets/images/choicepart/Extend.png differ diff --git a/src/assets/images/choicepart/Group.png b/src/assets/images/choicepart/Group.png new file mode 100644 index 00000000..3c16e819 Binary files /dev/null and b/src/assets/images/choicepart/Group.png differ diff --git a/src/assets/images/choicepart/Material.png b/src/assets/images/choicepart/Material.png new file mode 100644 index 00000000..b4b1364a Binary files /dev/null and b/src/assets/images/choicepart/Material.png differ diff --git a/src/assets/images/choicepart/Order.png b/src/assets/images/choicepart/Order.png new file mode 100644 index 00000000..7c8a3216 Binary files /dev/null and b/src/assets/images/choicepart/Order.png differ diff --git a/src/assets/images/choicepart/Packaging.png b/src/assets/images/choicepart/Packaging.png new file mode 100644 index 00000000..60ccd89e Binary files /dev/null and b/src/assets/images/choicepart/Packaging.png differ diff --git a/src/assets/images/choicepart/Quality.png b/src/assets/images/choicepart/Quality.png new file mode 100644 index 00000000..e6680dfa Binary files /dev/null and b/src/assets/images/choicepart/Quality.png differ diff --git a/src/assets/images/choicepart/Report.png b/src/assets/images/choicepart/Report.png new file mode 100644 index 00000000..a103eede Binary files /dev/null and b/src/assets/images/choicepart/Report.png differ diff --git a/src/assets/images/choicepart/System.png b/src/assets/images/choicepart/System.png new file mode 100644 index 00000000..30a1a7e8 Binary files /dev/null and b/src/assets/images/choicepart/System.png differ diff --git a/src/assets/images/choicepart/Warehouse.png b/src/assets/images/choicepart/Warehouse.png new file mode 100644 index 00000000..d808730d Binary files /dev/null and b/src/assets/images/choicepart/Warehouse.png differ diff --git a/src/assets/images/choicepart/avatar.png b/src/assets/images/choicepart/avatar.png new file mode 100644 index 00000000..4b1f623a Binary files /dev/null and b/src/assets/images/choicepart/avatar.png differ diff --git a/src/assets/images/choicepart/choice-item-back.png b/src/assets/images/choicepart/choice-item-back.png new file mode 100644 index 00000000..1cddcef5 Binary files /dev/null and b/src/assets/images/choicepart/choice-item-back.png differ diff --git a/src/assets/images/choicepart/choicepart-back.png b/src/assets/images/choicepart/choicepart-back.png new file mode 100644 index 00000000..2f7a3de4 Binary files /dev/null and b/src/assets/images/choicepart/choicepart-back.png differ diff --git a/src/assets/images/cnbm.png b/src/assets/images/cnbm.png new file mode 100644 index 00000000..ed7d3fdf Binary files /dev/null and b/src/assets/images/cnbm.png differ diff --git a/src/assets/images/login-bg.png b/src/assets/images/login-bg.png new file mode 100644 index 00000000..0156badd Binary files /dev/null and b/src/assets/images/login-bg.png differ diff --git a/src/assets/img/1.jpg b/src/assets/img/1.jpg new file mode 100644 index 00000000..005bc57c Binary files /dev/null and b/src/assets/img/1.jpg differ diff --git a/src/assets/img/OperationalOverview/back.png b/src/assets/img/OperationalOverview/back.png new file mode 100644 index 00000000..ad2afe91 Binary files /dev/null and b/src/assets/img/OperationalOverview/back.png differ diff --git a/src/assets/img/OperationalOverview/title.png b/src/assets/img/OperationalOverview/title.png new file mode 100644 index 00000000..b8a7e9dd Binary files /dev/null and b/src/assets/img/OperationalOverview/title.png differ diff --git a/src/assets/img/Toughenedfurnace.png b/src/assets/img/Toughenedfurnace.png new file mode 100644 index 00000000..80263bd9 Binary files /dev/null and b/src/assets/img/Toughenedfurnace.png differ diff --git a/src/assets/img/back.jpg b/src/assets/img/back.jpg new file mode 100644 index 00000000..61df5c8c Binary files /dev/null and b/src/assets/img/back.jpg differ diff --git a/src/assets/img/back.png b/src/assets/img/back.png new file mode 100644 index 00000000..e9d7d397 Binary files /dev/null and b/src/assets/img/back.png differ diff --git a/src/assets/img/back1.png b/src/assets/img/back1.png new file mode 100644 index 00000000..8b811db9 Binary files /dev/null and b/src/assets/img/back1.png differ diff --git a/src/assets/img/bg-bottom-item.png b/src/assets/img/bg-bottom-item.png new file mode 100644 index 00000000..a45ee8ee Binary files /dev/null and b/src/assets/img/bg-bottom-item.png differ diff --git a/src/assets/img/choicepart/ArtManager.png b/src/assets/img/choicepart/ArtManager.png new file mode 100644 index 00000000..ae319647 Binary files /dev/null and b/src/assets/img/choicepart/ArtManager.png differ diff --git a/src/assets/img/choicepart/ArticleManager.png b/src/assets/img/choicepart/ArticleManager.png new file mode 100644 index 00000000..30a1a7e8 Binary files /dev/null and b/src/assets/img/choicepart/ArticleManager.png differ diff --git a/src/assets/img/choicepart/DataAnalysis.png b/src/assets/img/choicepart/DataAnalysis.png new file mode 100644 index 00000000..672cc103 Binary files /dev/null and b/src/assets/img/choicepart/DataAnalysis.png differ diff --git a/src/assets/img/choicepart/EquipmentManager.png b/src/assets/img/choicepart/EquipmentManager.png new file mode 100644 index 00000000..763e5396 Binary files /dev/null and b/src/assets/img/choicepart/EquipmentManager.png differ diff --git a/src/assets/img/choicepart/MaterialsManage.png b/src/assets/img/choicepart/MaterialsManage.png new file mode 100644 index 00000000..d808730d Binary files /dev/null and b/src/assets/img/choicepart/MaterialsManage.png differ diff --git a/src/assets/img/choicepart/OperationalOverview.png b/src/assets/img/choicepart/OperationalOverview.png new file mode 100644 index 00000000..77af0878 Binary files /dev/null and b/src/assets/img/choicepart/OperationalOverview.png differ diff --git a/src/assets/img/choicepart/WarehouseManager.png b/src/assets/img/choicepart/WarehouseManager.png new file mode 100644 index 00000000..8f18d70f Binary files /dev/null and b/src/assets/img/choicepart/WarehouseManager.png differ diff --git a/src/assets/img/choicepart/basicData.png b/src/assets/img/choicepart/basicData.png new file mode 100644 index 00000000..f1d1b73d Binary files /dev/null and b/src/assets/img/choicepart/basicData.png differ diff --git a/src/assets/img/choicepart/choice-item-back.png b/src/assets/img/choicepart/choice-item-back.png new file mode 100644 index 00000000..1cddcef5 Binary files /dev/null and b/src/assets/img/choicepart/choice-item-back.png differ diff --git a/src/assets/img/choicepart/choicepart-back.png b/src/assets/img/choicepart/choicepart-back.png new file mode 100644 index 00000000..b16893b4 Binary files /dev/null and b/src/assets/img/choicepart/choicepart-back.png differ diff --git a/src/assets/img/choicepart/energyManage.png b/src/assets/img/choicepart/energyManage.png new file mode 100644 index 00000000..f1d1b73d Binary files /dev/null and b/src/assets/img/choicepart/energyManage.png differ diff --git a/src/assets/img/choicepart/factoryManage.png b/src/assets/img/choicepart/factoryManage.png new file mode 100644 index 00000000..a804d851 Binary files /dev/null and b/src/assets/img/choicepart/factoryManage.png differ diff --git a/src/assets/img/choicepart/formManage.png b/src/assets/img/choicepart/formManage.png new file mode 100644 index 00000000..7c8a3216 Binary files /dev/null and b/src/assets/img/choicepart/formManage.png differ diff --git a/src/assets/img/choicepart/orderManage.png b/src/assets/img/choicepart/orderManage.png new file mode 100644 index 00000000..23038d23 Binary files /dev/null and b/src/assets/img/choicepart/orderManage.png differ diff --git a/src/assets/img/choicepart/packingManage.png b/src/assets/img/choicepart/packingManage.png new file mode 100644 index 00000000..60ccd89e Binary files /dev/null and b/src/assets/img/choicepart/packingManage.png differ diff --git a/src/assets/img/choicepart/qualityManage.png b/src/assets/img/choicepart/qualityManage.png new file mode 100644 index 00000000..e6680dfa Binary files /dev/null and b/src/assets/img/choicepart/qualityManage.png differ diff --git a/src/assets/img/cnbm.png b/src/assets/img/cnbm.png new file mode 100644 index 00000000..ed7d3fdf Binary files /dev/null and b/src/assets/img/cnbm.png differ diff --git a/src/assets/img/empty.png b/src/assets/img/empty.png new file mode 100644 index 00000000..de349a33 Binary files /dev/null and b/src/assets/img/empty.png differ diff --git a/src/assets/img/energy.png b/src/assets/img/energy.png new file mode 100644 index 00000000..cb341110 Binary files /dev/null and b/src/assets/img/energy.png differ diff --git a/src/assets/img/head-w.png b/src/assets/img/head-w.png new file mode 100644 index 00000000..85dca606 Binary files /dev/null and b/src/assets/img/head-w.png differ diff --git a/src/assets/img/head.png b/src/assets/img/head.png new file mode 100644 index 00000000..0e5d2483 Binary files /dev/null and b/src/assets/img/head.png differ diff --git a/src/assets/img/jiantou.svg b/src/assets/img/jiantou.svg new file mode 100644 index 00000000..9652390b --- /dev/null +++ b/src/assets/img/jiantou.svg @@ -0,0 +1,18 @@ + + + + icon/流程箭头备份 5 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/login-back.jpg b/src/assets/img/login-back.jpg new file mode 100644 index 00000000..cfed13e1 Binary files /dev/null and b/src/assets/img/login-back.jpg differ diff --git a/src/assets/img/login-back.png b/src/assets/img/login-back.png new file mode 100644 index 00000000..a98739e7 Binary files /dev/null and b/src/assets/img/login-back.png differ diff --git a/src/assets/img/login-new.jpg b/src/assets/img/login-new.jpg new file mode 100644 index 00000000..b39ac147 Binary files /dev/null and b/src/assets/img/login-new.jpg differ diff --git a/src/assets/img/login.gif b/src/assets/img/login.gif new file mode 100644 index 00000000..8c931207 Binary files /dev/null and b/src/assets/img/login.gif differ diff --git a/src/assets/img/login1.gif b/src/assets/img/login1.gif new file mode 100644 index 00000000..2ca2b406 Binary files /dev/null and b/src/assets/img/login1.gif differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png new file mode 100644 index 00000000..9fdd8338 Binary files /dev/null and b/src/assets/img/logo.png differ diff --git a/src/assets/img/medal/champion.png b/src/assets/img/medal/champion.png new file mode 100644 index 00000000..38006430 Binary files /dev/null and b/src/assets/img/medal/champion.png differ diff --git a/src/assets/img/medal/secondPlace.png b/src/assets/img/medal/secondPlace.png new file mode 100644 index 00000000..425b76c5 Binary files /dev/null and b/src/assets/img/medal/secondPlace.png differ diff --git a/src/assets/img/medal/thirdPlace.png b/src/assets/img/medal/thirdPlace.png new file mode 100644 index 00000000..db1d9edc Binary files /dev/null and b/src/assets/img/medal/thirdPlace.png differ diff --git a/src/assets/img/status.png b/src/assets/img/status.png new file mode 100644 index 00000000..283cdd41 Binary files /dev/null and b/src/assets/img/status.png differ diff --git a/src/assets/img/uploadIcon.png b/src/assets/img/uploadIcon.png new file mode 100644 index 00000000..fb344f9f Binary files /dev/null and b/src/assets/img/uploadIcon.png differ diff --git a/src/assets/logo/cnbm.png b/src/assets/logo/cnbm.png new file mode 100644 index 00000000..ed7d3fdf Binary files /dev/null and b/src/assets/logo/cnbm.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 3180e79f..707d79e4 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -6,6 +6,7 @@ @import './btn.scss'; body { + // min-height: 1024px; height: 100%; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index 7efb2546..4df69394 100644 --- a/src/assets/styles/login.scss +++ b/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; @@ -32,233 +37,385 @@ $tabWidth: $tabW * 1px; $rowHeight: $rowH * 1px; $buttonHeight: $buttonH * 1px; +// 1080px 高度为基准的 1px +$base1px: 0.15vh; // 1px / 1080px; + // - - - - - 页面基础设置 .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 calc(16 * 0.12vh) 40px rgba(0, 0, 0, 0.07); + // border-radius: 20px; + // 定位 + position: relative; + display: flex; + + .pic { + flex: 3; + width: 1px; + min-width: 800px; + // 元素 + // width: $picWidth; + height: $picHeight; + // height: 10vh; + 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 { + position: relative; + margin-top: 14vh; + flex: 2; + // width: 800px; + display: flex; + flex-direction: column; + align-items: center; + + .pc-title { + width: 100%; + text-align: center; + clear: both; + position: relative; + top: calc(-32 * $base1px); + height: calc(128 * $base1px); + + .title { + margin: 0; + margin-left: calc(28 * 0.12vh); + font-weight: 400; + user-select: none; + color: #000; + font-size: calc(28 * 0.12vh); + line-height: calc(40 * 0.12vh); + letter-spacing: calc(2 * 0.12vh); + + .cnbm_logo { + height: calc(40 * 0.12vh); + width: calc(40 * 0.12vh); + position: relative; + top: calc(8 * 0.12vh); + right: calc(8 * 0.12vh); + } + } + + .sub-title { + margin: 0; + margin-left: calc(28 * 0.12vh); + font-weight: 400; + user-select: none; + color: #000; + font-size: calc(28 * 0.12vh); + line-height: calc(48 * 0.12vh); + letter-spacing: 2px; + } + } + + .mobile-title, + .mobile-switch { + display: none; + } + + .form-cont { + // height: 560px; + flex: 1; + overflow: hidden; + } + + .footer { + user-select: none; + // 元素 + margin: calc(12 * 0.12vh) 0; + height: calc(16 * 0.12vh); + line-height: calc(16 * 0.12vh); + font-size: calc(12 * 0.12vh); + color: #8c8c8c; + + a, + a:hover, + a:active { + color: inherit; + text-decoration: none; + } + } + + .form { + margin-top: 0; + box-sizing: border-box; + width: 100%; + + :deep(.el-tabs__content) { + padding: 20px 0 0; + } + :deep(.el-tabs__item) { + user-select: none; + // 元素 + width: $tabWidth; + // height: $rowHeight; + height: calc(54 * 0.12vh); + padding: 0; + // 文字 + line-height: $rowHeight; + color: #666666; + font-size: calc(14 * 0.12vh); + 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; + height: calc(72 * 0.12vh); + 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: calc(18 * 0.12vh); + 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: calc(52 * 0.12vh); + // height: 66px; + color: #262626; + font-size: calc(14 * 0.12vh); + } + :deep(.el-checkbox__label) { + font-size: calc(14 * 0.12vh); + line-height: calc(12 * 0.12vh); + } + } } // - - - - - 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; - } - } - } - } - } +@media screen and (min-width: 1920px) { + .container { + .content { + .field { + flex: initial; + // width: 800px; + width: 40vw; + } + } + } } +@media screen and (min-height: 1024px) { + .container { + .content { + .field { + margin-top: 16vh; + } + } + } +} + +@media screen and (max-height: 1024px) { + .container { + .content { + .field { + margin-top: 8vh; + } + } + } +} + + + +@media screen and (min-width: 599px) and (max-width: 1366px) { + .container { + // min-width: 599px; + min-width: 42vw; + + .content { + // width: 710px; + // height: 397px; + width: 100%; + height: 100%; + .pic { + // width: 314px; + display: none; + } + .field { + // margin-top: 6vh; + // 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; + } + } + } + } + } +} + +// @media screen and (max-height: 1080px) { +// .container { +// .field { +// transform: scale(0.74); +// } +// } +// } /* ===== MOBILE DESIGN ===== */ $mobileW: 375; @@ -273,115 +430,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; - 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; - } - } + .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; + 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: calc(12 * 0.12vh); + font-family: PingFang SC; + font-weight: 400; + line-height: 17px; + color: #333333; + opacity: 0.6; + // 定位 + // position: absolute; + bottom: -calc(32 * 0.12vh); + } + } } diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 17ef2e4f..d9b3a411 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -104,8 +104,8 @@ h6 { word-break: break-word; background-color: #f8f8f9; color: #515a6e; - height: 40px; - font-size: 13px; + // height: 40px; + // font-size: 13px; } } .el-table__body-wrapper { diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 4902d3d8..d7c255e2 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -35,7 +35,7 @@ export default { const first = matched[0] if (!this.isDashboard(first)) { - matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched) + matched = [{ path: '/', meta: { title: '首页' }}].concat(matched) } this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index 72d7e166..c780edba 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -21,11 +21,13 @@ v-model="form[col.prop]" @change="$emit('update', form)" :placeholder="`请输入${col.label}`" + :disabled="disabled" v-bind="col.bind" /> @@ -33,6 +35,7 @@ v-if="col.select" v-model="form[col.prop]" :placeholder="`请选择${col.label}`" + :disabled="disabled" @change="$emit('update', form)" v-bind="col.bind"> + v-model="form[col.prop]" + :inlineStyle="col.style" + @on-change="$emit('update', form)" + v-bind="col.bind">
+ 上传文件
@@ -92,9 +114,10 @@ + :key="file.fileUrl" + @delete="!disabled && handleDeleteFile(file, col.prop)" />
@@ -105,6 +128,7 @@ - diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index d9c4f4db..80a5c56e 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -15,7 +15,7 @@ ref="fileUpload" > - 选取文件 + 选取文件
请上传 @@ -29,10 +29,10 @@
  • - {{ getFileName(file.name) }} + {{ fileName }}
    - 删除 + 删除
    • @@ -66,6 +66,16 @@ export default { isShowTip: { type: Boolean, default: true + }, + // 是否禁用 + disabled: { + type: Boolean, + default: false + }, + //文件名称 + fName: { + type: String, + default: '' } }, data() { @@ -76,6 +86,7 @@ export default { uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址 headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部 fileList: [], + fileName: '' }; }, watch: { @@ -100,6 +111,14 @@ export default { }, deep: true, immediate: true + }, + fName: { + handler(val) { + if (val) { + console.log('11', val) + this.fileName = val + } + } } }, computed: { @@ -112,6 +131,7 @@ export default { // 上传前校检格式和大小 handleBeforeUpload(file) { // 校检文件类型 + this.fileName = file.name if (this.fileType) { let fileExtension = ""; if (file.name.lastIndexOf(".") > -1) { @@ -145,7 +165,7 @@ export default { }, // 上传失败 handleUploadError(err) { - this.$modal.msgError("上传图片失败，请重试"); + this.$modal.msgError("上传文件失败，请重试"); this.$modal.closeLoading() }, // 上传成功回调 @@ -175,10 +195,15 @@ export default { this.number = 0; this.$emit("input", this.listToString(this.fileList)); this.$modal.closeLoading(); + this.returnFileName() } }, + returnFileName() { + this.$emit('name', this.fileName) + }, // 获取文件名称 getFileName(name) { + console.log('你好', name) if (name.lastIndexOf("/") > -1) { return name.slice(name.lastIndexOf("/") + 1); } else { diff --git a/src/layout/components/DialogWithMenu.vue b/src/layout/components/DialogWithMenu.vue deleted file mode 100644 index efd6428e..00000000 --- a/src/layout/components/DialogWithMenu.vue +++ /dev/null @@ -1,978 +0,0 @@ - - - - - diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 655a9ab5..c23172b9 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -5,8 +5,12 @@ -
    - + - -
    + - {{ nickname }} + - + +
    @@ -51,7 +55,8 @@ import Screenfull from '@/components/Screenfull' import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' import NotifyMessage from '@/layout/components/Message' -import {getPath} from "@/utils/ruoyi"; +// import {getPath} from "@/utils/ruoyi"; +import NavbarRight from './NavbarRight.vue' export default { components: { @@ -61,7 +66,8 @@ export default { Screenfull, SizeSelect, Search, - NotifyMessage + NotifyMessage, + NavbarRight }, computed: { ...mapGetters([ diff --git a/src/layout/components/NavbarRight.vue b/src/layout/components/NavbarRight.vue new file mode 100644 index 00000000..228cde89 --- /dev/null +++ b/src/layout/components/NavbarRight.vue @@ -0,0 +1,120 @@ + + + \ No newline at end of file diff --git a/src/layout/components/Sidebar/SidebarItem copy.vue b/src/layout/components/Sidebar/SidebarItem copy.vue new file mode 100644 index 00000000..7880cbba --- /dev/null +++ b/src/layout/components/Sidebar/SidebarItem copy.vue @@ -0,0 +1,96 @@ + + + diff --git a/src/layout/components/Sidebar/index copy.vue b/src/layout/components/Sidebar/index copy.vue new file mode 100644 index 00000000..79f2dc38 --- /dev/null +++ b/src/layout/components/Sidebar/index copy.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 79f2dc38..bac19f28 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -28,7 +28,7 @@ mode="vertical"> @@ -47,7 +47,12 @@ export default { components: { SidebarItem, Logo }, computed: { ...mapState(['settings']), - ...mapGetters(['sidebarRouters', 'sidebar']), + ...mapGetters(['sidebarRouters', 'sidebar', 'choicepart']), + routeList() { + // return [this.partList[this.choicepart]] + // return [this.sidebarRouters[29]] + return [this.sidebarRouters[this.choicepart]] + }, activeMenu() { const route = this.$route; const { meta, path } = route; diff --git a/src/main.js b/src/main.js index eb160008..9d15a451 100644 --- a/src/main.js +++ b/src/main.js @@ -71,7 +71,9 @@ 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); diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 36c61708..51b89d80 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -28,10 +28,61 @@ export default { // tableBtn: [], // 占位 // searchBarFormConfig: [], // 占位 // // 弹窗表单配置 - // dialogFormConfig: [], // 占位 + // dialogFormConfig: [], // + updateUrl: '', + addUrl: '', + pageUrl: '', + infoUrl: '', + deleteUrl: '', + basePath: '', + form: {} }; }, + 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' || method === 'delete') ? 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) { + debugger; + return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload); + }, + + // 过滤后端传回的详情数据 filterData(data, keys) { const obj = {}; diff --git a/src/permission.js b/src/permission.js index 7125eeaa..03b66576 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) // 增加三方登陆 update by 芋艿 -const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee'] +const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee', '/AGVBoard', '/coldBoard', '/processingBoard'] router.beforeEach((to, from, next) => { NProgress.start() @@ -19,7 +19,12 @@ router.beforeEach((to, from, next) => { if (to.path === '/login') { next({ path: '/' }) NProgress.done() - } else { + } + // else if (to.path === '/AGVBoard') { + // next({ path: '/AGVBoard' }) + // NProgress.done() + // } + else { if (store.getters.roles.length === 0) { isRelogin.show = true // 获取字典数据 add by 芋艿 diff --git a/src/router/index.js b/src/router/index.js index fc08e221..40189532 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -71,16 +71,47 @@ export const constantRoutes = [ }, { 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 } - // } - // ] + component: () => import('@/views/choicePart'), + hidden: true, + meta: { requireToken: true } + }, + // { + // 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 } + // // } + // // ] + // }, + { + path: '/AGVBoard', + name: 'AGVBoard', + // component: Layout, + // route level code-splitting + // this generates a separate chunk (about.[hash].js) for this route + // which is lazy-loaded when the route is visited. + component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/AGVBoard.vue') + }, + { + path: '/coldBoard', + name: 'coldBoard', + // route level code-splitting + // this generates a separate chunk (about.[hash].js) for this route + // which is lazy-loaded when the route is visited. + component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/coldBoard.vue') + }, + { + path: '/processingBoard', + name: 'processingBoard', + // route level code-splitting + // this generates a separate chunk (about.[hash].js) for this route + // which is lazy-loaded when the route is visited. + component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/processingBoard.vue') }, { path: '/user', diff --git a/src/store/getters.js b/src/store/getters.js index 79cdf2c3..16103f89 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -17,6 +17,7 @@ const getters = { topbarRouters:state => state.permission.topbarRouters, defaultRoutes:state => state.permission.defaultRoutes, sidebarRouters:state => state.permission.sidebarRouters, + choicepart: state => state.app.choicepart, // 数据字典 dict_datas: state => state.dict.dictDatas } diff --git a/src/store/modules/app.js b/src/store/modules/app.js index 623622e1..55fa6c8e 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -8,6 +8,7 @@ const state = { }, device: "desktop", size: localStorage.getItem("size") || "medium", + choicepart: localStorage.getItem('choicepart') || null }; const mutations = { @@ -38,6 +39,10 @@ const mutations = { SET_SIDEBAR_HIDE: (state, status) => { state.sidebar.hide = status; }, + SET_CHOICEPART: (state, choicepart) => { + state.choicepart = choicepart + localStorage.setItem('choicepart', choicepart) + } }; const actions = { @@ -56,6 +61,9 @@ const actions = { toggleSideBarHide({ commit }, status) { commit("SET_SIDEBAR_HIDE", status); }, + setChoicepart({ commit }, choicepart) { + commit('SET_CHOICEPART', choicepart) + } }; export default { diff --git a/src/styles/index.scss b/src/styles/index.scss index f77398f4..d162abed 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -163,7 +163,7 @@ input, textarea{ } ::-webkit-scrollbar-thumb { - background-color: rgba(144,147,153,.5); + background-color: #EDEDED; background-clip: padding-box; min-height: 28px; -webkit-border-radius: 2em; @@ -174,12 +174,13 @@ input, textarea{ } ::-webkit-scrollbar-thumb:hover { - background-color: rgba(144,147,153,.3); + background-color: #D9D9D9; } // 抽屉head区域---start .el-drawer__header { padding-bottom: 20px; + padding-left: 30px; margin-bottom: 23px; font-size: 20px; font-weight: 500; @@ -195,4 +196,8 @@ input, textarea{ margin-right: 8px; vertical-align: middle; } -// 抽屉head区域---end \ No newline at end of file +// 抽屉head区域---end +// 弹出框，上下分布，去掉label的padding-bottom +.el-form--label-top .el-form-item__label { + padding: 0; +} \ No newline at end of file diff --git a/src/utils/cache.js b/src/utils/cache.js new file mode 100644 index 00000000..f37a9007 --- /dev/null +++ b/src/utils/cache.js @@ -0,0 +1,53 @@ +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'); + }, +} \ No newline at end of file diff --git a/src/utils/dict.js b/src/utils/dict.js index 77b6b2b6..ecaafb16 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -89,13 +89,21 @@ export const DICT_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' + 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', } /** diff --git a/src/utils/index.js b/src/utils/index.js index 7a71498b..571095a2 100644 --- a/src/utils/index.js +++ b/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,3 +438,7 @@ export function toCamelCase(str, upperCaseFirst) { return str; } + +export function IdToName(targetId, source, prop = 'name') { + return source.find(item => item.id === targetId)?.[prop] +} \ No newline at end of file diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index fd5d1095..3b4e5256 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -187,19 +187,6 @@ export function getTenantEnable() { return process.env.VUE_APP_TENANT_ENABLE || true; } -/** - * 获得验证码功能是否开启 - */ -export function getCaptchaEnable() { - if (process.env.VUE_APP_CAPTCHA_ENABLE === "true") { - return true; - } - if (process.env.VUE_APP_CAPTCHA_ENABLE === "false") { - return false; - } - return process.env.VUE_APP_CAPTCHA_ENABLE || true; -} - /** * 获得文档是否开启 */ diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue new file mode 100644 index 00000000..5ac357bc --- /dev/null +++ b/src/views/OperationalOverview/AGVBoard.vue @@ -0,0 +1,1016 @@ + + + + + + + + + + diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue new file mode 100644 index 00000000..13b9dfec --- /dev/null +++ b/src/views/OperationalOverview/coldBoard.vue @@ -0,0 +1,1136 @@ + + + + + + + + + diff --git a/src/views/OperationalOverview/components/BarChart.vue b/src/views/OperationalOverview/components/BarChart.vue new file mode 100644 index 00000000..b719d38c --- /dev/null +++ b/src/views/OperationalOverview/components/BarChart.vue @@ -0,0 +1,127 @@ + + + + diff --git a/src/views/OperationalOverview/components/LineChart.vue b/src/views/OperationalOverview/components/LineChart.vue new file mode 100644 index 00000000..0b87c726 --- /dev/null +++ b/src/views/OperationalOverview/components/LineChart.vue @@ -0,0 +1,253 @@ + + + + + + diff --git a/src/views/OperationalOverview/components/LineRadioGroup.vue b/src/views/OperationalOverview/components/LineRadioGroup.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/OperationalOverview/components/PieChart.vue b/src/views/OperationalOverview/components/PieChart.vue new file mode 100644 index 00000000..da36e585 --- /dev/null +++ b/src/views/OperationalOverview/components/PieChart.vue @@ -0,0 +1,221 @@ + + + + + + diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue new file mode 100644 index 00000000..49ef81f1 --- /dev/null +++ b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue new file mode 100644 index 00000000..1d5ef821 --- /dev/null +++ b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue new file mode 100644 index 00000000..cf643a53 --- /dev/null +++ b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue @@ -0,0 +1,144 @@ + + + + + + diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue new file mode 100644 index 00000000..84b5976b --- /dev/null +++ b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue @@ -0,0 +1,170 @@ + + + + diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue new file mode 100644 index 00000000..eef54784 --- /dev/null +++ b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue @@ -0,0 +1,31 @@ + + + + diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue new file mode 100644 index 00000000..961ab65f --- /dev/null +++ b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue @@ -0,0 +1,60 @@ + + + + + + diff --git a/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue b/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue new file mode 100644 index 00000000..dc3cf0b7 --- /dev/null +++ b/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue @@ -0,0 +1,83 @@ + + + + + + diff --git a/src/views/OperationalOverview/components/SimpleLineChart.vue b/src/views/OperationalOverview/components/SimpleLineChart.vue new file mode 100644 index 00000000..a62b7157 --- /dev/null +++ b/src/views/OperationalOverview/components/SimpleLineChart.vue @@ -0,0 +1,229 @@ + + + + + + diff --git a/src/views/OperationalOverview/components/alarmLevel.vue b/src/views/OperationalOverview/components/alarmLevel.vue new file mode 100644 index 00000000..ec999515 --- /dev/null +++ b/src/views/OperationalOverview/components/alarmLevel.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/views/OperationalOverview/components/baseContainer/index.vue b/src/views/OperationalOverview/components/baseContainer/index.vue new file mode 100644 index 00000000..09b91e92 --- /dev/null +++ b/src/views/OperationalOverview/components/baseContainer/index.vue @@ -0,0 +1,195 @@ + + + + + + diff --git a/src/views/OperationalOverview/components/baseContainer1/index.vue b/src/views/OperationalOverview/components/baseContainer1/index.vue new file mode 100644 index 00000000..78249620 --- /dev/null +++ b/src/views/OperationalOverview/components/baseContainer1/index.vue @@ -0,0 +1,187 @@ + + + + + + diff --git a/src/views/OperationalOverview/components/baseTable.vue b/src/views/OperationalOverview/components/baseTable.vue new file mode 100644 index 00000000..52fc5ca8 --- /dev/null +++ b/src/views/OperationalOverview/components/baseTable.vue @@ -0,0 +1,187 @@ + + + + diff --git a/src/views/OperationalOverview/components/baseVideo.vue b/src/views/OperationalOverview/components/baseVideo.vue new file mode 100644 index 00000000..64d2403f --- /dev/null +++ b/src/views/OperationalOverview/components/baseVideo.vue @@ -0,0 +1,40 @@ + + + + diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue new file mode 100644 index 00000000..3b91bfb8 --- /dev/null +++ b/src/views/OperationalOverview/components/doubleYChart .vue @@ -0,0 +1,325 @@ + + + + diff --git a/src/views/OperationalOverview/components/linearBarChart.vue b/src/views/OperationalOverview/components/linearBarChart.vue new file mode 100644 index 00000000..9dea0694 --- /dev/null +++ b/src/views/OperationalOverview/components/linearBarChart.vue @@ -0,0 +1,237 @@ + + + diff --git a/src/views/OperationalOverview/components/mixins/resize.js b/src/views/OperationalOverview/components/mixins/resize.js new file mode 100644 index 00000000..234953b1 --- /dev/null +++ b/src/views/OperationalOverview/components/mixins/resize.js @@ -0,0 +1,55 @@ +import { debounce } from '@/utils' + +export default { + data() { + return { + $_sidebarElm: null, + $_resizeHandler: null + } + }, + mounted() { + this.$_resizeHandler = debounce(() => { + if (this.chart) { + this.chart.resize() + } + }, 100) + this.$_initResizeEvent() + this.$_initSidebarResizeEvent() + }, + beforeDestroy() { + this.$_destroyResizeEvent() + this.$_destroySidebarResizeEvent() + }, + // to fixed bug when cached by keep-alive + // https://github.com/PanJiaChen/vue-element-admin/issues/2116 + activated() { + this.$_initResizeEvent() + this.$_initSidebarResizeEvent() + }, + deactivated() { + this.$_destroyResizeEvent() + this.$_destroySidebarResizeEvent() + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_initResizeEvent() { + window.addEventListener('resize', this.$_resizeHandler) + }, + $_destroyResizeEvent() { + window.removeEventListener('resize', this.$_resizeHandler) + }, + $_sidebarResizeHandler(e) { + if (e.propertyName === 'width') { + this.$_resizeHandler() + } + }, + $_initSidebarResizeEvent() { + this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0] + this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler) + }, + $_destroySidebarResizeEvent() { + this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler) + } + } +} diff --git a/src/views/OperationalOverview/components/nextDay.vue b/src/views/OperationalOverview/components/nextDay.vue new file mode 100644 index 00000000..ba01a329 --- /dev/null +++ b/src/views/OperationalOverview/components/nextDay.vue @@ -0,0 +1,40 @@ + + + + diff --git a/src/views/OperationalOverview/components/threeBarChart.vue b/src/views/OperationalOverview/components/threeBarChart.vue new file mode 100644 index 00000000..43fce6d1 --- /dev/null +++ b/src/views/OperationalOverview/components/threeBarChart.vue @@ -0,0 +1,237 @@ + + + + diff --git a/src/views/OperationalOverview/components/topRadioGroup.vue b/src/views/OperationalOverview/components/topRadioGroup.vue new file mode 100644 index 00000000..f1339253 --- /dev/null +++ b/src/views/OperationalOverview/components/topRadioGroup.vue @@ -0,0 +1,86 @@ + + + + + + + diff --git a/src/views/OperationalOverview/components/utilChart.vue b/src/views/OperationalOverview/components/utilChart.vue new file mode 100644 index 00000000..cc1b553a --- /dev/null +++ b/src/views/OperationalOverview/components/utilChart.vue @@ -0,0 +1,67 @@ + + + + diff --git a/src/views/OperationalOverview/components/videoFooter.vue b/src/views/OperationalOverview/components/videoFooter.vue new file mode 100644 index 00000000..d9f3fcb7 --- /dev/null +++ b/src/views/OperationalOverview/components/videoFooter.vue @@ -0,0 +1,66 @@ + + + + diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue new file mode 100644 index 00000000..33cbe729 --- /dev/null +++ b/src/views/OperationalOverview/processingBoard.vue @@ -0,0 +1,972 @@ + + + + + + + + + + diff --git a/src/views/OperationalOverview/styles/btn.scss b/src/views/OperationalOverview/styles/btn.scss new file mode 100644 index 00000000..e6ba1a8e --- /dev/null +++ b/src/views/OperationalOverview/styles/btn.scss @@ -0,0 +1,99 @@ +@import './variables.scss'; + +@mixin colorBtn($color) { + background: $color; + + &:hover { + color: $color; + + &:before, + &:after { + background: $color; + } + } +} + +.blue-btn { + @include colorBtn($blue) +} + +.light-blue-btn { + @include colorBtn($light-blue) +} + +.red-btn { + @include colorBtn($red) +} + +.pink-btn { + @include colorBtn($pink) +} + +.green-btn { + @include colorBtn($green) +} + +.tiffany-btn { + @include colorBtn($tiffany) +} + +.yellow-btn { + @include colorBtn($yellow) +} + +.pan-btn { + font-size: 14px; + color: #fff; + padding: 14px 36px; + border-radius: 8px; + border: none; + outline: none; + transition: 600ms ease all; + position: relative; + display: inline-block; + + &:hover { + background: #fff; + + &:before, + &:after { + width: 100%; + transition: 600ms ease all; + } + } + + &:before, + &:after { + content: ''; + position: absolute; + top: 0; + right: 0; + height: 2px; + width: 0; + transition: 400ms ease all; + } + + &::after { + right: inherit; + top: inherit; + left: 0; + bottom: 0; + } +} + +.custom-button { + display: inline-block; + line-height: 1; + white-space: nowrap; + cursor: pointer; + background: #fff; + color: #fff; + -webkit-appearance: none; + text-align: center; + box-sizing: border-box; + outline: 0; + margin: 0; + padding: 10px 15px; + font-size: 14px; + border-radius: 4px; +} diff --git a/src/views/OperationalOverview/styles/element-ui.scss b/src/views/OperationalOverview/styles/element-ui.scss new file mode 100644 index 00000000..b6edbddf --- /dev/null +++ b/src/views/OperationalOverview/styles/element-ui.scss @@ -0,0 +1,173 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + +.cell { + .el-tag { + margin-right: 0px; + } +} + +.visual-container { + .el-table { + .cell { + line-height: 1.2em !important; + } + } +} +.app-container { + .el-table th>.cell { + color: rgb(0, 0, 0,0.85); + } + .el-table__body tr.current-row>td { + background-color: #EAF1FC; + } + +} +.el-table--medium th, .el-table--medium td { + padding: 5px 0; +} + +::v-deep .el-table__fixed-right { + right: 0 !important; + height: 100% !important; +} +.el-button--mini { + padding: 4px 0; +} +.small-padding { + .cell { + padding-left: 5px; + padding-right: 5px; + } +} + +.fixed-width { + .el-button--mini { + padding: 7px 10px; + min-width: 60px; + } +} + +.status-col { + .cell { + padding: 0 10px; + text-align: center; + + .el-tag { + margin-right: 0px; + } + } +} + +.el-button--primary { + background-color: #0B58FF !important; + border-color: #0B58FF !important; +} +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; + border-radius: 4px; +} + +.el-dialog__header { + padding: 12px 24px 8px; + border-bottom: 1px solid #E9E9E9; + text-align: left; +} + +.el-dialog__title { + font-size: 16px; + font-weight: 700; + color: rgba(0, 0, 0, 0.85); +} + +.el-form-item__label { + font-size: 14px; + font-weight: 400; + color: rgba(0, 0, 0, 0.65); + padding-right: 8px; +} + +.el-dialog__headerbtn { + top: 16px; + right: 24px; +} + +.el-form-item--medium .el-form-item__label { + line-height: 32px; +} + +.el-button--medium { + padding: 8px 16px; +} + +.el-select { + width: 100%; +} + +.el-switch.is-checked .el-switch__core { + background-color: #0B58FF; + border-color: #0B58FF; +} + +.el-radio__input.is-checked .el-radio__inner { + background-color: #0B58FF; + border-color: #0B58FF; +} + +.el-button--text{ + color:#0B58FF; +} + +.el-tabs__item.is-active { + color: #0b58ff; +} + +.el-tooltip__popper.is-dark { + max-width: 1100px; +} +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} + +// fix date-picker ui bug in filter-item +.el-range-editor.el-input__inner { + display: inline-flex !important; +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} diff --git a/src/views/OperationalOverview/styles/element-variables.scss b/src/views/OperationalOverview/styles/element-variables.scss new file mode 100644 index 00000000..5bdc4dad --- /dev/null +++ b/src/views/OperationalOverview/styles/element-variables.scss @@ -0,0 +1,31 @@ +/** +* I think element-ui's default theme color is too light for long-term use. +* So I modified the default color and you can modify it to your liking. +**/ + +/* theme color */ +$--color-primary: #1890ff; +$--color-success: #13ce66; +$--color-warning: #ffba00; +$--color-danger: #ff4949; +// $--color-info: #1E1E1E; + +$--button-font-weight: 400; + +// $--color-text-regular: #1f2d3d; + +$--border-color-light: #dfe4ed; +$--border-color-lighter: #e6ebf5; + +$--table-border: 1px solid #dfe6ec; + +/* icon font path, required */ +$--font-path: "~element-ui/lib/theme-chalk/fonts"; + +@import "~element-ui/packages/theme-chalk/src/index"; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + theme: $--color-primary; +} diff --git a/src/views/OperationalOverview/styles/index.scss b/src/views/OperationalOverview/styles/index.scss new file mode 100644 index 00000000..577e7e66 --- /dev/null +++ b/src/views/OperationalOverview/styles/index.scss @@ -0,0 +1,319 @@ +@import './variables.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; +@import './btn.scss'; + +body { + height: 100%; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +.no-padding { + padding: 0px !important; +} + +.padding-content { + padding: 4px 0; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.fr { + float: right; +} + +.fl { + float: left; +} + +.pr-5 { + padding-right: 5px; +} + +.pl-5 { + padding-left: 5px; +} + +.block { + display: block; +} + +.pointer { + cursor: pointer; +} + +.inlineBlock { + display: block; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +aside { + background: #eef1f6; + padding: 8px 24px; + margin-bottom: 20px; + border-radius: 2px; + display: block; + line-height: 32px; + font-size: 16px; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; + color: #2c3e50; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + a { + color: #337ab7; + cursor: pointer; + + &:hover { + color: rgb(32, 160, 255); + } + } +} + +//main-container全局样式 +.app-container { + margin:0 16px 0; + background-color: #fff; + border-radius: 4px; + padding: 16px 16px 0; + height: calc(100vh - 134px); + overflow: auto; +} + +.components-container { + margin: 30px 50px; + position: relative; +} + +// 覆盖原有的分页样式-start + +.el-pagination { + position: relative; +} + +.el-pagination.is-background .btn-prev,.el-pagination.is-background .btn-next,.el-pagination.is-background .el-pager li { + background-color: #fff; +} + +.el-pagination__jump { + margin-left: 125px; +} + +.el-pagination__sizes { + position: absolute; + right: 100px; +} + +.el-pagination.is-background .el-pager li:not(.disabled).active { + background-color: #0B58FF; +} +.el-pagination .el-select .el-input .el-input__inner { + height: 22px; +} +.el-badge__content { + border: none; +} +// 覆盖原有的分页样式-end + +.text-center { + text-align: center +} + +.sub-navbar { + height: 50px; + line-height: 50px; + position: relative; + width: 100%; + text-align: right; + padding-right: 20px; + transition: 600ms ease position; + background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); + + .subtitle { + font-size: 20px; + color: #fff; + } + + &.draft { + background: #d0d0d0; + } + + &.deleted { + background: #d0d0d0; + } +} + +.link-type, +.link-type:focus { + color: #337ab7; + cursor: pointer; + + &:hover { + color: rgb(32, 160, 255); + } +} + +.filter-container { + padding-bottom: 10px; + + .filter-item { + display: inline-block; + vertical-align: middle; + margin-bottom: 10px; + } +} + +//refine vue-multiselect plugin +.multiselect { + line-height: 16px; +} + +.multiselect--active { + z-index: 1000 !important; +} + +// 业务代码中 +.content-row { + padding: 10px 0; +} + +.el-dialog { + width: 1000px; +} +.el-dialog__body { + padding: 30px 40px; +} + +.el-dialog__wrapper { + backdrop-filter: blur(5px); +} + +::-webkit-scrollbar { + width: 8px; + height: 8px; + background-color: transparent; +} + +::-webkit-scrollbar-track-piece { + background-color:rgba(144,147,153,0); +} + +::-webkit-scrollbar-corner { + background-color:rgba(144,147,153,0); +} + +::-webkit-scrollbar-track { + width: 6px; + background: rgba(144,147,153,0); + -webkit-border-radius: 2em; + -moz-border-radius: 2em; + border-radius: 2em; +} + +::-webkit-scrollbar-thumb { + background-color: rgba(144,147,153,.5); + background-clip: padding-box; + min-height: 28px; + -webkit-border-radius: 2em; + -moz-border-radius: 2em; + border-radius: 2em; + transition: background-color .3s; + cursor: pointer; +} + +::-webkit-scrollbar-thumb:hover { + background-color: rgba(144,147,153,.3); +} + +// 数据分析单选框样式覆盖 + +.app-container{ + .data-analysis-radio{ + .el-radio-button__inner { + border: 0; + padding: 7px 0; + margin: 0 15px; + } + .el-radio-button__orig-radio:checked+.el-radio-button__inner{ + background-color: transparent; + color: #606266; + box-shadow: 0 0 0 0 transparent; + border-bottom: 2px solid #0B58FF; + } + .el-radio-button:first-child .el-radio-button__inner, + .el-radio-button:last-child .el-radio-button__inner { + border-radius: 0; + } + } +} + +.el-table--group, .el-table--border { + border: none; +} + +// 全局loading样式覆盖 +.el-loading-mask{ + z-index: 99999; +} + + +input::-webkit-input-placeholder { + /* WebKit browsers */ + font-size:12px; +} +input::-moz-placeholder { + /* Mozilla Firefox 19+ */ + font-size:12px; +} +input:-ms-input-placeholder { + font-size:12px; +} \ No newline at end of file diff --git a/src/views/OperationalOverview/styles/mixin.scss b/src/views/OperationalOverview/styles/mixin.scss new file mode 100644 index 00000000..06fa0612 --- /dev/null +++ b/src/views/OperationalOverview/styles/mixin.scss @@ -0,0 +1,66 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} + +@mixin pct($pct) { + width: #{$pct}; + position: relative; + margin: 0 auto; +} + +@mixin triangle($width, $height, $color, $direction) { + $width: $width/2; + $color-border-style: $height solid $color; + $transparent-border-style: $width solid transparent; + height: 0; + width: 0; + + @if $direction==up { + border-bottom: $color-border-style; + border-left: $transparent-border-style; + border-right: $transparent-border-style; + } + + @else if $direction==right { + border-left: $color-border-style; + border-top: $transparent-border-style; + border-bottom: $transparent-border-style; + } + + @else if $direction==down { + border-top: $color-border-style; + border-left: $transparent-border-style; + border-right: $transparent-border-style; + } + + @else if $direction==left { + border-right: $color-border-style; + border-top: $transparent-border-style; + border-bottom: $transparent-border-style; + } +} diff --git a/src/views/OperationalOverview/styles/sidebar.scss b/src/views/OperationalOverview/styles/sidebar.scss new file mode 100644 index 00000000..4c2691e4 --- /dev/null +++ b/src/views/OperationalOverview/styles/sidebar.scss @@ -0,0 +1,209 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + // margin-left: $sideBarWidth; + position: relative; + } + + .sidebar-container { + transition: width 0.28s; + // width: $sideBarWidth !important; + // background-color: $menuBg; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + // background-color: $menuHover !important; + } + } + + .is-active>.el-submenu__title { + // color: $subMenuActiveText !important; + } + + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item { + // min-width: $sideBarWidth !important; + // background-color: $subMenuBg !important; + + &:hover { + // background-color: $subMenuHover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + } + } + + .el-submenu { + overflow: hidden; + + &>.el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .el-submenu__icon-arrow { + display: none; + } + } + } + + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + // min-width: $sideBarWidth !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + // width: $sideBarWidth !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + // transform: translate3d(-$sideBarWidth, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + } + + .nest-menu .el-submenu>.el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + // background-color: $menuHover !important; + } + } + + // the scroll bar appears when the subMenu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/src/views/OperationalOverview/styles/transition.scss b/src/views/OperationalOverview/styles/transition.scss new file mode 100644 index 00000000..4cb27cc8 --- /dev/null +++ b/src/views/OperationalOverview/styles/transition.scss @@ -0,0 +1,48 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/src/views/OperationalOverview/styles/variables.scss b/src/views/OperationalOverview/styles/variables.scss new file mode 100644 index 00000000..e96d9af7 --- /dev/null +++ b/src/views/OperationalOverview/styles/variables.scss @@ -0,0 +1,35 @@ +// base color +$blue:#324157; +$light-blue:#3A71A8; +$red:#C03639; +$pink: #E65D6E; +$green: #30B08F; +$tiffany: #4AB7BD; +$yellow:#FEC171; +$panGreen: #30B08F; + +// sidebar +$menuText:#bfcbd9; +$menuActiveText:#409EFF; +$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 + +$menuBg:#304156; +$menuHover:#263445; + +$subMenuBg:#0B253F; +$subMenuHover:#001528; + +$sideBarWidth: 248px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuText: $menuText; + menuActiveText: $menuActiveText; + subMenuActiveText: $subMenuActiveText; + // menuBg: $menuBg; + menuHover: $menuHover; + subMenuBg: $subMenuBg; + subMenuHover: $subMenuHover; + sideBarWidth: $sideBarWidth; +} diff --git a/src/views/base/coreAlarmLog/index.vue b/src/views/base/coreAlarmLog/index.vue new file mode 100644 index 00000000..731bb4ab --- /dev/null +++ b/src/views/base/coreAlarmLog/index.vue @@ -0,0 +1,182 @@ + + + diff --git a/src/views/base/coreCustomer/add-or-updata.vue b/src/views/base/coreCustomer/add-or-updata.vue new file mode 100644 index 00000000..5156cc42 --- /dev/null +++ b/src/views/base/coreCustomer/add-or-updata.vue @@ -0,0 +1,105 @@ + + + + diff --git a/src/views/base/coreCustomer/index.vue b/src/views/base/coreCustomer/index.vue new file mode 100644 index 00000000..0a1a9a1a --- /dev/null +++ b/src/views/base/coreCustomer/index.vue @@ -0,0 +1,176 @@ + + + diff --git a/src/views/base/coreDepartment/add-or-updata.vue b/src/views/base/coreDepartment/add-or-updata.vue new file mode 100644 index 00000000..a4959014 --- /dev/null +++ b/src/views/base/coreDepartment/add-or-updata.vue @@ -0,0 +1,115 @@ + + + + + + diff --git a/src/views/base/coreDepartment/index.vue b/src/views/base/coreDepartment/index.vue new file mode 100644 index 00000000..abdcccf3 --- /dev/null +++ b/src/views/base/coreDepartment/index.vue @@ -0,0 +1,173 @@ + + + diff --git a/src/views/core/base/equipment/components/AssetsUpload.vue b/src/views/base/coreEquipment/components/AssetsUpload.vue similarity index 69% rename from src/views/core/base/equipment/components/AssetsUpload.vue rename to src/views/base/coreEquipment/components/AssetsUpload.vue index c6d410e5..a5a3319d 100644 --- a/src/views/core/base/equipment/components/AssetsUpload.vue +++ b/src/views/base/coreEquipment/components/AssetsUpload.vue @@ -18,7 +18,13 @@ 预览
    --> -
    +
    -
    - + style="width: 100%"> +
    + +
    + +
    @@ -77,7 +83,7 @@ diff --git a/src/views/core/base/equipmentType/index.vue b/src/views/base/coreEquipmentType/index.vue similarity index 78% rename from src/views/core/base/equipmentType/index.vue rename to src/views/base/coreEquipmentType/index.vue index c5358201..d2505792 100644 --- a/src/views/core/base/equipmentType/index.vue +++ b/src/views/base/coreEquipmentType/index.vue @@ -37,7 +37,12 @@ @close="cancel" @cancel="cancel" @confirm="submitForm"> - +
    @@ -65,13 +70,13 @@ export default { return { searchBarKeys: ['name'], tableBtn: [ - this.$auth.hasPermi('base:equipment-type:update') + this.$auth.hasPermi('base:core-equipment-type:update') ? { type: 'edit', btnName: '修改', } : undefined, - this.$auth.hasPermi('base:equipment-type:delete') + this.$auth.hasPermi('base:core-equipment-type:delete') ? { type: 'delete', btnName: '删除', @@ -86,15 +91,15 @@ export default { width: 180, filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, - { prop: 'name', label: '设备类型名称' }, - { prop: 'code', label: '检测类型编码' }, + { prop: 'name', label: '类型名称' }, + { prop: 'code', label: '类型编号' }, { prop: 'remark', label: '备注' }, ], searchBarFormConfig: [ { type: 'input', label: '设备类型', - placeholder: '请输入设备类型名称', + placeholder: '设备类型', param: 'name', }, { @@ -107,7 +112,7 @@ export default { type: 'separate', }, { - type: this.$auth.hasPermi('base:equipment-type:create') + type: this.$auth.hasPermi('base:core-equipment-type:create') ? 'button' : '', btnName: '新增', @@ -128,18 +133,19 @@ export default { [ { input: true, - label: '设备类型名称', + label: '类型名称', prop: 'name', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '类型名称不能为空', trigger: 'blur' }], // bind: { // disabled: true, // some condition, like detail mode... // } }, { input: true, - label: '设备类型编码', + label: '类型编号', prop: 'code', - url: '/base/equipment-type/getCode', + url: '/base/core-equipment-type/getCode', + rules: [{ required: true, message: '类型编号不能为空', trigger: 'blur' }], }, ], [ @@ -147,7 +153,7 @@ export default { select: true, label: '父类', prop: 'parentId', - url: '/base/equipment-type/page?pageNo=1&pageSize=100', + url: '/base/core-equipment-type/page?pageNo=1&pageSize=100', }, {}, ], @@ -169,7 +175,13 @@ export default { name: '', }, // 表单参数 - form: {}, + form: { + code: undefined, + name: undefined, + id: undefined, + parentId: undefined, + remark: undefined + }, }; }, watch: { @@ -207,8 +219,6 @@ export default { name: undefined, parentId: undefined, remark: undefined, - fileNames: [], - fileUrls: [], }; this.resetForm('form'); }, @@ -234,25 +244,6 @@ export default { const id = row.id; getEquipmentType(id).then((response) => { this.form = response.data; - // this.form = { - // code: 'SBLX20230925184444000041', - // name: '测试131', - // remark: '测试可删除', - // id: '1706258479729336322', - // files: [ - // { fileName: '1.png', fileUrl: '', fileType: 2 }, - // { fileName: '1.asdfaslkjfkasdf.png', fileUrl: '', fileType: 2 }, - // { fileName: '2.txt', fileUrl: '', fileType: 2 }, - // { fileName: '1.rar', fileUrl: '', fileType: 2 }, - // { fileName: '1.kkk', fileUrl: '', fileType: 2 }, - // { fileName: 'test.file', fileUrl: '', fileType: 2 }, - // { fileName: '222', fileUrl: '', fileType: 2 }, - // { fileName: 'g', fileUrl: '', fileType: 2 }, - // ], - // createTime: 1695638697000, - // parentId: '1701869972319584257', - // }; - // debugger; this.open = true; this.title = '修改设备类型'; }); @@ -284,7 +275,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除设备类型"' + row.name + '"?') + .confirm('是否确认删除设备类型"' + row.name + '"的数据项?') .then(function () { return deleteEquipmentType(id); }) diff --git a/src/views/base/coreHotMaterial/add-or-updata.vue b/src/views/base/coreHotMaterial/add-or-updata.vue new file mode 100644 index 00000000..4ffcd316 --- /dev/null +++ b/src/views/base/coreHotMaterial/add-or-updata.vue @@ -0,0 +1,90 @@ + + + + diff --git a/src/views/base/coreHotMaterial/index.vue b/src/views/base/coreHotMaterial/index.vue new file mode 100644 index 00000000..0667b5c9 --- /dev/null +++ b/src/views/base/coreHotMaterial/index.vue @@ -0,0 +1,178 @@ + + + diff --git a/src/views/base/coreMajor/add-or-updata.vue b/src/views/base/coreMajor/add-or-updata.vue new file mode 100644 index 00000000..b02ea231 --- /dev/null +++ b/src/views/base/coreMajor/add-or-updata.vue @@ -0,0 +1,77 @@ + + + + diff --git a/src/views/base/coreMajor/index.vue b/src/views/base/coreMajor/index.vue new file mode 100644 index 00000000..145efb94 --- /dev/null +++ b/src/views/base/coreMajor/index.vue @@ -0,0 +1,168 @@ + + + diff --git a/src/views/base/coreProduct/SmallTitle.vue b/src/views/base/coreProduct/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/coreProduct/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/base/coreProduct/add-or-updata.vue new file mode 100644 index 00000000..a3cee7eb --- /dev/null +++ b/src/views/base/coreProduct/add-or-updata.vue @@ -0,0 +1,438 @@ + + + + + diff --git a/src/views/base/coreProduct/attr-add.vue b/src/views/base/coreProduct/attr-add.vue new file mode 100644 index 00000000..87285750 --- /dev/null +++ b/src/views/base/coreProduct/attr-add.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/base/coreProduct/index.vue b/src/views/base/coreProduct/index.vue new file mode 100644 index 00000000..3f8d6cf1 --- /dev/null +++ b/src/views/base/coreProduct/index.vue @@ -0,0 +1,207 @@ + + + diff --git a/src/views/base/coreProductionLine/add-or-updata.vue b/src/views/base/coreProductionLine/add-or-updata.vue new file mode 100644 index 00000000..96229e03 --- /dev/null +++ b/src/views/base/coreProductionLine/add-or-updata.vue @@ -0,0 +1,115 @@ + + + + diff --git a/src/views/base/coreProductionLine/index.vue b/src/views/base/coreProductionLine/index.vue new file mode 100644 index 00000000..cbcfd3db --- /dev/null +++ b/src/views/base/coreProductionLine/index.vue @@ -0,0 +1,198 @@ + + + diff --git a/src/views/base/coreSupplier/add-or-updata.vue b/src/views/base/coreSupplier/add-or-updata.vue new file mode 100644 index 00000000..bcdfb8a3 --- /dev/null +++ b/src/views/base/coreSupplier/add-or-updata.vue @@ -0,0 +1,130 @@ + + + + diff --git a/src/views/base/coreSupplier/index.vue b/src/views/base/coreSupplier/index.vue new file mode 100644 index 00000000..6be77494 --- /dev/null +++ b/src/views/base/coreSupplier/index.vue @@ -0,0 +1,176 @@ + + + diff --git a/src/views/base/coreWorkOrder/SmallTitle.vue b/src/views/base/coreWorkOrder/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/coreWorkOrder/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/coreWorkOrder/add-or-updata.vue b/src/views/base/coreWorkOrder/add-or-updata.vue new file mode 100644 index 00000000..0ba46ebd --- /dev/null +++ b/src/views/base/coreWorkOrder/add-or-updata.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/views/base/coreWorkOrder/addWorkOrder.vue b/src/views/base/coreWorkOrder/addWorkOrder.vue new file mode 100644 index 00000000..d8314256 --- /dev/null +++ b/src/views/base/coreWorkOrder/addWorkOrder.vue @@ -0,0 +1,324 @@ + + \ No newline at end of file diff --git a/src/views/base/coreWorkOrder/allocation.vue b/src/views/base/coreWorkOrder/allocation.vue new file mode 100644 index 00000000..24f3f5cc --- /dev/null +++ b/src/views/base/coreWorkOrder/allocation.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/views/base/coreWorkOrder/attr-add.vue b/src/views/base/coreWorkOrder/attr-add.vue new file mode 100644 index 00000000..f32953ef --- /dev/null +++ b/src/views/base/coreWorkOrder/attr-add.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/src/views/base/coreWorkOrder/detail.vue b/src/views/base/coreWorkOrder/detail.vue new file mode 100644 index 00000000..d3859ebf --- /dev/null +++ b/src/views/base/coreWorkOrder/detail.vue @@ -0,0 +1,456 @@ + + + + + diff --git a/src/views/base/coreWorkOrder/index.vue b/src/views/base/coreWorkOrder/index.vue new file mode 100644 index 00000000..f03890b6 --- /dev/null +++ b/src/views/base/coreWorkOrder/index.vue @@ -0,0 +1,490 @@ + + + diff --git a/src/views/base/coreWorker/add-or-updata.vue b/src/views/base/coreWorker/add-or-updata.vue new file mode 100644 index 00000000..3cc522c4 --- /dev/null +++ b/src/views/base/coreWorker/add-or-updata.vue @@ -0,0 +1,366 @@ + + + + diff --git a/src/views/base/coreWorker/index.vue b/src/views/base/coreWorker/index.vue new file mode 100644 index 00000000..c5a6ccdf --- /dev/null +++ b/src/views/base/coreWorker/index.vue @@ -0,0 +1,204 @@ + + + diff --git a/src/views/base/coreWorkshopSection/add-or-updata.vue b/src/views/base/coreWorkshopSection/add-or-updata.vue new file mode 100644 index 00000000..de23a2a8 --- /dev/null +++ b/src/views/base/coreWorkshopSection/add-or-updata.vue @@ -0,0 +1,105 @@ + + + + diff --git a/src/views/base/coreWorkshopSection/index.vue b/src/views/base/coreWorkshopSection/index.vue new file mode 100644 index 00000000..11b6f4a7 --- /dev/null +++ b/src/views/base/coreWorkshopSection/index.vue @@ -0,0 +1,172 @@ + + + diff --git a/src/views/base/custom/SmallTitle.vue b/src/views/base/custom/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/custom/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/custom/index.vue b/src/views/base/custom/index.vue new file mode 100644 index 00000000..97c816dc --- /dev/null +++ b/src/views/base/custom/index.vue @@ -0,0 +1,409 @@ + + + + + diff --git a/src/views/base/custom/preview.vue b/src/views/base/custom/preview.vue new file mode 100644 index 00000000..f7d18de2 --- /dev/null +++ b/src/views/base/custom/preview.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/src/views/base/custom/print-data.js b/src/views/base/custom/print-data.js new file mode 100644 index 00000000..077f8388 --- /dev/null +++ b/src/views/base/custom/print-data.js @@ -0,0 +1,90 @@ +/* + * @Author: zhp + * @Date: 2023-09-27 14:23:54 + * @LastEditTime: 2023-09-27 14:29:59 + * @LastEditors: zhp + * @Description: + */ +export default { + totalCap: '壹佰元整', + test: { + a: '111', + b: '222', + longText: '浙江在线3月29日讯最近，\n一篇小学五年级学生写的作文引起了钱报记者的关注这篇作文的题目叫做《脏话风波》，讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多，有的人说话甚至句句“带把儿”。班主任为了遏制这种现象，煞费苦心想了很多办法，跟学生斗智斗勇……看到这篇作文，记者突然想到，自己读六年级的儿子有天突然冒出一句脏话。此前，他是从不说脏话的。问他怎么学会的，他也说不出个所以然来。于是，记者做了这个小学生脏话现象调查。经过了解才发现，小学生爱说脏话竟然较为普遍，一般三年级会冒出苗头。无论是学习成绩好的，还是平时不太起眼的，都会说脏话。而且，说脏话会“传染”，一旦冒头不制止，到了五六年级甚至可能在班里大爆发。以下为作文《脏话风波》浙江在线3月29日讯最近，一篇小学五年级学生写的作文引起了钱报记者的关注。这篇作文的题目叫做《脏话风波》，讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多，有的人说话甚至句句“带把儿”。班主任为了遏制这种现象，煞费苦心想了很多办法，跟学生斗智斗勇……看到这篇作文，记者突然想到，自己读六年级的儿子有天突然冒出一句脏话。此前，他是从不说脏话的。问他怎么学会的，他也说不出个所以然来。于是，记者做了这个小学生脏话现象调查。经过了解才发现，小学生爱说脏话竟然较为普遍，一般三年级会冒出苗头。无论是学习成绩好的，还是平时不太起眼的，都会说脏话。而且，说脏话会“传染”，一旦冒头不制止，到了五六年级甚至可能在班里大爆发。以下为作文《脏话风波》浙江在线3月29日讯最近，一篇小学五年级学生写的作文引起了钱报记者的关注。这篇作文的题目叫做《脏话风波》，讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多，有的人说话甚至句句“带把儿”。班主任为了遏制这种现象，煞费苦心想了很多办法，跟学生斗智斗勇……看到这篇作文，记者突然想到，自己读六年级的儿子有天突然冒出一句脏话。此前，他是从不说脏话的。问他怎么学会的，他也说不出个所以然来。于是，记者做了这个小学生脏话现象调查。经过了解才发现，小学生爱说脏话竟然较为普遍，一般三年级会冒出苗头。无论是学习成绩好的，还是平时不太起眼的，都会说脏话。而且，说脏话会“传染”，一旦冒头不制止，到了五六年级甚至可能在班里大爆发。以下为作文《脏话风波》浙江在线3月29日讯最近，一篇小学五年级学生写的作文引起了钱报记者的关注。这篇作文的题目叫做《脏话风波》，讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多，有的人说话甚至句句“带把儿”。班主任为了遏制这种现象，煞费苦心想了很多办法，跟学生斗智斗勇……看到这篇作文，记者突然想到，自己读六年级的儿子有天突然冒出一句脏话。此前，他是从不说脏话的。问他怎么学会的，他也说不出个所以然来。于是，记者做了这个小学生脏话现象调查。经过了解才发现，小学生爱说脏话竟然较为普遍，一般三年级会冒出苗头。无论是学习成绩好的，还是平时不太起眼的，都会说脏话。而且，说脏话会“传染”，一旦冒头不制止，到了五六年级甚至可能在班里大爆发。以下为作文《脏话风波》浙江在线3月29日讯最近，一篇小学五年级学生写的作文引起了钱报记者的关注。这篇作文的题目叫做《脏话风波》，讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多，有的人说话甚至句句“带把儿”。班主任为了遏制这种现象，煞费苦心想了很多办法，跟学生斗智斗勇……看到这篇作文，记者突然想到，自己读六年级的儿子有天突然冒出一句脏话。此前，他是从不说脏话的。问他怎么学会的，他也说不出个所以然来。于是，记者做了这个小学生脏话现象调查。经过了解才发现，小学生爱说脏话竟然较为普遍，一般三年级会冒出苗头。无论是学习成绩好的，还是平时不太起眼的，都会说脏话。而且，说脏话会“传染”，一旦冒头不制止，到了五六年级甚至可能在班里大爆发。以下为作文讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多，有的人说话甚至句句“带把儿”。班主任为了遏制这种现象，煞费苦心想了很多办法，跟学生斗智斗勇……看到这篇作文，记者突然想到，自己读六年级的儿子有天突然冒出一句脏话。此前，他是从不说脏话的。问他怎么学会的，他也说不出个所以然来。于是，记者做了这个小学生脏话现象调查。经过了解才发现，小学生爱说脏话竟然较为普遍，一般三年级会冒出苗头。无论是学习成绩好的，还是平时不太起眼的，都会说脏话。而且，说脏话会“传染”，一旦冒头不制止，到了五六年级甚至可能在班里大爆发。以下为作文经过了解才发现，小学生爱说脏话竟然较为普遍，一般三年级会冒出苗头。无论是学习成绩好的，还是平时不太起眼的，都会说脏话。而且，说脏话会“传染”，一旦冒头不制止，到了五六年级甚至可能在班里大爆发。以下为作文讲述的是小作者班级里发生的一种不文明现象——讲脏话的同学越来越多，有的人说话甚至句句“带把儿”。班主任为了遏制这种现象，煞费苦心想了很多办法，跟学生斗智斗勇……看到这篇作文，记者突然想到，自己读六年级的儿子有天突然冒出一句脏话。此前，他是从不说脏话的。问他怎么学会的，他也说不出个所以然来。于是，记者做了这个小学生脏话现象调查。经过了解才发现，小学生爱说脏话竟然较为普遍，一般三年级会冒出苗头。无论是学习成绩好的，还是平时不太起眼的，都会说脏话。而且，说脏话会“传染”，一旦冒头不制止，到了五六年级甚至可能在班里大爆发。以下为作文' + }, + testaaa: { + a: { + b: { + c: { + d: 'dddddddddddd' + } + } + } + }, + table_test: { + a: [ + { NAME: '测试商品01', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品02', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品03', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品04', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品05', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品06', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品07', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品08', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品09', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品10', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品11', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品12', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品13', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品14', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品15', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品16', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品17', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品18', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品19', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品20', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品21', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品22', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品23', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品24', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品25', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品26', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品27', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品28', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品29', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品30', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' } + ] + }, + table: [ + { NAME: '测试商品01', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品02', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品03', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品04', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品05', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品06', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品07', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品08', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品09', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品10', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品11', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品12', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品13', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品14', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品15', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品16', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品17', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品18', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品19', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品20', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品21', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品22', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品23', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品24', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品25', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品26', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品27', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品28', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品29', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' }, + { NAME: '测试商品30', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' } + ] +} diff --git a/src/views/base/custom/providers.js b/src/views/base/custom/providers.js new file mode 100644 index 00000000..a37fb60f --- /dev/null +++ b/src/views/base/custom/providers.js @@ -0,0 +1,245 @@ +/* eslint-disable */ +import {hiprint} from 'vue-plugin-hiprint' + +/* eslint-disable */ +// import {hiprint} from '../../index' + +// 自定义设计元素1 +export const aProvider = function (ops) { + var addElementTypes = function (context) { + context.removePrintElementTypes("aProviderModule"); + context.addPrintElementTypes( + "aProviderModule", + [ + new hiprint.PrintElementTypeGroup("平台", [ + { + tid: 'aProviderModule.header', title: '单据表头', data: '单据表头', type: 'text', + options: { + testData: '单据表头', + height: 17, + fontSize: 16.5, + fontWeight: "700", + textAlign: "center", + hideTitle: true + } + }, + { + tid: 'aProviderModule.type', title: '单据类型', data: '单据类型', type: 'text', + options: { + testData: '单据类型', + height: 16, + fontSize: 15, + fontWeight: "700", + textAlign: "center", + hideTitle: true + } + }, + { + tid: 'aProviderModule.order', title: '订单编号', data: 'XS888888888', type: 'text', + options: { + field: 'orderId', + testData: 'XS888888888', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + { + tid: 'aProviderModule.date', title: '业务日期', data: '2020-01-01', type: 'text', + options: { + field: 'date', + testData: '2020-01-01', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + { + tid: 'aProviderModule.barcode', title: '条形码', data: 'XS888888888', type: 'text', + options: { + field: 'barcode', + testData: 'XS888888888', + height: 32, + fontSize: 12, + lineHeight: 18, + textType: "barcode" + } + }, + { + tid: 'aProviderModule.qrcode', title: '二维码', data: 'XS888888888', type: 'text', + options: { + field: 'qrcode', + testData: 'XS888888888', + height: 32, + fontSize: 12, + lineHeight: 18, + textType: "qrcode" + } + }, + { + tid: 'aProviderModule.platform', title: '平台名称', data: '平台名称', type: 'text', + options: { + testData: '平台名称', + height: 17, + fontSize: 16.5, + fontWeight: "700", + textAlign: "center", + hideTitle: true + } + }, + {tid: 'aProviderModule.logo', title: 'Logo', data: '', type: 'image'}, + ]), + new hiprint.PrintElementTypeGroup("库管", [ + { + tid: 'aProviderModule.creater', title: '制单人', data: '李四', type: 'text', + options: { + field: 'creater', + testData: '李四', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + { + tid: 'aProviderModule.printDate', title: '打印时间', data: '2022-01-01 09:00', type: 'text', + options: { + field: 'printDate', + testData: '2022-01-01 09:00', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + { + tid: 'aProviderModule.signer', title: '库管签字', data: '', type: 'text', + options: { + title: '库管签字：', + height: 16, + fontSize: 6.75, + fontWeight: "700", + textAlign: "left", + textContentVerticalAlign: "middle" + } + }, + ]), + new hiprint.PrintElementTypeGroup("表格/其他", [ + { + tid: 'aProviderModule.table', title: '订单数据', + type: 'table', + options: { + field: 'table', + tableHeaderRepeat: 'first', + tableFooterRepeat: 'last', + fields: [ + {text: '名称', field: 'NAME'}, + {text: '数量', field: 'SL'}, + {text: '规格', field: 'GG'}, + {text: '条码', field: 'TM'}, + {text: '单价', field: 'DJ'}, + {text: '金额', field: 'JE'}, + ], + }, + editable: true, + columnDisplayEditable: true,//列显示是否能编辑 + columnDisplayIndexEditable: true,//列顺序显示是否能编辑 + columnTitleEditable: true,//列标题是否能编辑 + columnResizable: true, //列宽是否能调整 + columnAlignEditable: true,//列对齐是否调整 + isEnableEditField: true, //编辑字段 + isEnableContextMenu: true, //开启右键菜单 默认true + isEnableInsertRow: true, //插入行 + isEnableDeleteRow: true, //删除行 + isEnableInsertColumn: true, //插入列 + isEnableDeleteColumn: true, //删除列 + isEnableMergeCell: true, //合并单元格 + columns: [ + [ + {title: '名称', align: 'center', field: 'NAME', width: 150}, + {title: '数量', align: 'center', field: 'SL', width: 80}, + {title: '规格', align: 'center', field: 'GG', width: 80, checked: false}, + {title: '条码', align: 'center', field: 'TM', width: 100, checked: false}, + {title: '单价', align: 'center', field: 'DJ', width: 100}, + {title: '金额', align: 'center', field: 'JE', width: 100, checked: false}, + ], + ], + rowsColumnsMerge: function (data, col, index) { + // 返回一个数组,参数一为行（rowspan）合并数,参数二为列（colspan）合并数, 被合并的行或者列值设为0 + if (index == 0) { + return [1, data.INDEX % 2 == 1 ? 2 : 1] + } else if (index > 0 && index < 2) { + return [data.INDEX % 2 == 1 ? 0 : 1, 1] + } else { + return [data.INDEX % 2 == 1 ? 2 : 0, 1] + } + }, + footerFormatter: function (options, rows, data, currentPageGridRowsData) { + if (data && data['totalCap']) { + return `${'应收金额大写: ' + data['totalCap']}` + } + return '应收金额大写: ' + }, + }, + {tid: 'aProviderModule.customText', title: '文本', customText: '自定义文本', custom: true, type: 'text'}, + { + tid: 'aProviderModule.longText', title: '长文本', type: 'longText', options: { + field: 'test.longText', + width: 200, + testData: '长文本分页/不分页测试' + }, + } + ]), + new hiprint.PrintElementTypeGroup("辅助", [ + { + tid: 'aProviderModule.hline', + title: '横线', + type: 'hline' + }, + { + tid: 'aProviderModule.vline', + title: '竖线', + type: 'vline' + }, + { + tid: 'aProviderModule.rect', + title: '矩形', + type: 'rect' + }, + { + tid: 'aProviderModule.oval', + title: '椭圆', + type: 'oval' + }, + { + tid: 'aProviderModule.barcode', + title: '条形码', + type: 'barcode', + }, + { + tid: 'aProviderModule.qrcode', + title: '二维码', + type: 'qrcode', + } + ]) + ] + ); + }; + return { + addElementTypes: addElementTypes + }; +}; + +// type: 1供货商 2经销商 +export default [{ + name: 'A设计', + value: 'aProviderModule', + type: 1, + f: aProvider() +}] diff --git a/src/views/base/equipmentAttr/index.vue b/src/views/base/equipmentAttr/index.vue deleted file mode 100644 index 9696af92..00000000 --- a/src/views/base/equipmentAttr/index.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - diff --git a/src/views/base/equipmentBindSection/dialogForm.vue b/src/views/base/equipmentBindSection/dialogForm.vue index ce6ff70c..625d3f65 100644 --- a/src/views/base/equipmentBindSection/dialogForm.vue +++ b/src/views/base/equipmentBindSection/dialogForm.vue @@ -16,7 +16,7 @@ + :rules="[{ required: true, message: '产线不能为空', trigger: 'blur' }]"> + :rules="[{ required: true, message: '工段不能为空', trigger: 'blur' }]"> + :rules="[{ required: true, message: '设备不能为空', trigger: 'blur' }]"> ({ label: item.name, diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/base/equipmentBindSection/index.vue index f0c2238f..de05001e 100644 --- a/src/views/base/equipmentBindSection/index.vue +++ b/src/views/base/equipmentBindSection/index.vue @@ -176,7 +176,7 @@ export default { url: '/base/production-line/listAll', // prop: '__product_line', // __开头代表不传递给服务器 prop: 'productionLineId', // 编辑接口返回的产线id，所以不能使用上面那种形式 - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }], }, { select: true, @@ -185,16 +185,16 @@ export default { // depends: '__product_line', // 依赖产线获取数据 depends: 'productionLineId', prop: 'workshopSectionId', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }], }, ], [ { select: true, label: '设备', - url: '/base/equipment/page?pageNo=1&pageSize=100', + url: '/base/core-equipment/page?pageNo=1&pageSize=100', prop: 'equipmentId', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }], }, { input: true, diff --git a/src/views/base/equipmentFile/index.vue b/src/views/base/equipmentFile/index.vue deleted file mode 100644 index cb2ebd21..00000000 --- a/src/views/base/equipmentFile/index.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - diff --git a/src/views/base/equipmentGroupAlarm/dialogForm.vue b/src/views/base/equipmentGroupAlarm/dialogForm.vue index 329186da..fbc3a928 100644 --- a/src/views/base/equipmentGroupAlarm/dialogForm.vue +++ b/src/views/base/equipmentGroupAlarm/dialogForm.vue @@ -16,36 +16,20 @@ + :rules="[{ required: true, message: '报警编码不能为空', trigger: 'blur' }]"> - + :rules="[{ required: true, message: '报警类型不能为空', trigger: 'blur' }]"> + :rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]"> + :rules="[{ required: true, message: '参数列名不能为空', trigger: 'blur' }]"> + :rules="[{ required: true, message: '报警内容不能为空', trigger: 'blur' }]"> Number(val), }, ], - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], [ @@ -230,13 +232,11 @@ export default { input: true, label: '标准值', prop: 'defaultValue', - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, { input: true, label: '描述', prop: 'description', - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], [ @@ -244,7 +244,6 @@ export default { input: true, label: '备注', prop: 'remark', - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], ], @@ -424,35 +423,35 @@ export default { }, // 提交属性表 - async submitAttrForm() { - this.$refs['attrForm'].validate((valid) => { + submitAttrForm() { + this.$refs['attrForm'].validate(async (valid) => { if (!valid) { return; } - }); - const isEdit = this.attrForm.id != null; - this.attrFormSubmitting = true; - const res = await this.$axios({ - url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate, - method: isEdit ? 'put' : 'post', - data: { - ...this.attrForm, - connectId: this.infoData.id - }, - }); - - if (res.code == 0) { - this.closeAttrForm(); - this.$message({ - message: `${isEdit ? '更新' : '创建'}成功`, - type: 'success', - duration: 1500, - onClose: () => { - this.getAttrList(); + const isEdit = this.attrForm.id != null; + this.attrFormSubmitting = true; + const res = await this.$axios({ + url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate, + method: isEdit ? 'put' : 'post', + data: { + ...this.attrForm, + connectId: this.infoData.id, }, }); - } - this.attrFormSubmitting = false; + + if (res.code == 0) { + this.closeAttrForm(); + this.$message({ + message: `${isEdit ? '更新' : '创建'}成功`, + type: 'success', + duration: 1500, + onClose: () => { + this.getAttrList(); + }, + }); + } + this.attrFormSubmitting = false; + }); }, closeAttrForm() { diff --git a/src/views/base/equipmentPlcConnect/index.vue b/src/views/base/equipmentPlcConnect/index.vue index f64f05cc..418c9c76 100644 --- a/src/views/base/equipmentPlcConnect/index.vue +++ b/src/views/base/equipmentPlcConnect/index.vue @@ -236,7 +236,7 @@ export default { prop: 'plcId', labelKey: `plcTableName`, url: '/base/equipment-plc/listAll', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }], bind: { filterable: true, }, @@ -247,8 +247,8 @@ export default { select: true, label: '设备', prop: 'equipmentId', - url: '/base/equipment/page?pageNo=1&pageSize=99', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + url: '/base/core-equipment/page?pageNo=1&pageSize=99', + rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }], bind: { filterable: true, }, @@ -274,7 +274,7 @@ export default { input: true, label: '设备名', prop: 'equipmentName', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }], // bind: { // disabled: this.editMode == 'detail', // some condition, like detail mode... // } @@ -283,7 +283,7 @@ export default { input: true, label: '关联表名', prop: 'plcTableName', - // url: '/base/equipment/getCode', + // url: '/base/core-equipment/getCode', }, ], ], @@ -320,7 +320,7 @@ export default { methods: { async getEquipmentOptions() { const res = await this.$axios({ - url: '/base/equipment/listAll', + url: '/base/core-equipment/listAll', method: 'get', }); return res.data; diff --git a/src/views/base/equipmentPlcParam/index.vue b/src/views/base/equipmentPlcParam/index.vue index e2454c75..5092dc9e 100644 --- a/src/views/base/equipmentPlcParam/index.vue +++ b/src/views/base/equipmentPlcParam/index.vue @@ -120,13 +120,13 @@ export default { input: true, label: '参数列名', prop: 'plcParamName', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }], }, { input: true, label: '参数名称', prop: 'name', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }], }, ], [ @@ -135,7 +135,6 @@ export default { label: '单位', prop: 'unit', options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT), - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, { switch: true, @@ -176,7 +175,6 @@ export default { transform: (val) => Number(val), }, ], - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], [ @@ -184,13 +182,11 @@ export default { input: true, label: '标准值', prop: 'defaultValue', - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, { input: true, label: '描述', prop: 'description', - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], [ @@ -198,7 +194,6 @@ export default { input: true, label: '备注', prop: 'remark', - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], ], diff --git a/src/views/base/material/SmallTitle.vue b/src/views/base/material/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/material/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/material/add-or-updata.vue b/src/views/base/material/add-or-updata.vue new file mode 100644 index 00000000..0c082ef9 --- /dev/null +++ b/src/views/base/material/add-or-updata.vue @@ -0,0 +1,459 @@ + + + + + diff --git a/src/views/base/material/attr-add.vue b/src/views/base/material/attr-add.vue new file mode 100644 index 00000000..a200c3a4 --- /dev/null +++ b/src/views/base/material/attr-add.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/base/material/index.vue b/src/views/base/material/index.vue new file mode 100644 index 00000000..6f35f2fe --- /dev/null +++ b/src/views/base/material/index.vue @@ -0,0 +1,252 @@ + + + diff --git a/src/views/base/materialDate/add-or-updata.vue b/src/views/base/materialDate/add-or-updata.vue new file mode 100644 index 00000000..da8626ec --- /dev/null +++ b/src/views/base/materialDate/add-or-updata.vue @@ -0,0 +1,108 @@ + + + + diff --git a/src/views/base/materialDate/index.vue b/src/views/base/materialDate/index.vue new file mode 100644 index 00000000..0a6e0ff7 --- /dev/null +++ b/src/views/base/materialDate/index.vue @@ -0,0 +1,190 @@ + + + diff --git a/src/views/base/materialProductBom/add-or-updata.vue b/src/views/base/materialProductBom/add-or-updata.vue new file mode 100644 index 00000000..b95d06e1 --- /dev/null +++ b/src/views/base/materialProductBom/add-or-updata.vue @@ -0,0 +1,402 @@ + + + + + diff --git a/src/views/base/materialProductBom/attr-add.vue b/src/views/base/materialProductBom/attr-add.vue new file mode 100644 index 00000000..08c04d92 --- /dev/null +++ b/src/views/base/materialProductBom/attr-add.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/src/views/base/materialProductBom/index.vue b/src/views/base/materialProductBom/index.vue new file mode 100644 index 00000000..05733596 --- /dev/null +++ b/src/views/base/materialProductBom/index.vue @@ -0,0 +1,180 @@ + + + diff --git a/src/views/base/materialUseLog/add-or-updata.vue b/src/views/base/materialUseLog/add-or-updata.vue new file mode 100644 index 00000000..2d5faf9c --- /dev/null +++ b/src/views/base/materialUseLog/add-or-updata.vue @@ -0,0 +1,260 @@ + + + + diff --git a/src/views/base/materialUseLog/index.vue b/src/views/base/materialUseLog/index.vue new file mode 100644 index 00000000..e491ca10 --- /dev/null +++ b/src/views/base/materialUseLog/index.vue @@ -0,0 +1,248 @@ + + + diff --git a/src/views/base/mixins/basic-add.js b/src/views/base/mixins/basic-add.js new file mode 100644 index 00000000..0b9acd23 --- /dev/null +++ b/src/views/base/mixins/basic-add.js @@ -0,0 +1,100 @@ +/* + * @Author: zwq + * @Date: 2022-08-24 11:19:43 + * @LastEditors: zwq + * @LastEditTime: 2023-08-03 14:21:04 + * @Description: + */ +export default { + data() { + /* eslint-disable */ + return { + urlOptions: { + createURL: '', + updateURL: '', + infoURL: '', + codeURL: '', + getOption: false, + isGetCode: false, + optionArrUrl: [], + optionArr: {} + }, + visible: false, + setData: false + } + }, + created() { + }, + activated() { + }, + methods: { + init(id) { + this.dataForm.id = id || ""; + this.visible = true; + if (this.urlOptions.getOption) { + this.getArr() + } + this.$nextTick(() => { + this.$refs["dataForm"].resetFields(); + if (this.dataForm.id) { + this.urlOptions.infoURL(id).then(response => { + this.dataForm = response.data; + if (this.setData) { + this.setDataForm() + } + }); + } else { + if (this.urlOptions.isGetCode) { + this.getCode() + } + } + }); + }, + getCode() { + this.urlOptions.codeURL() + .then(({ data: res }) => { + this.dataForm.code = res; + }) + .catch(() => {}); + }, + getArr() { + const params = { + pageSize: 100, + pageNo: 1, + } + this.urlOptions.optionArrUrl.forEach((item, index) => { + item(params).then(({ data: res }) => { + this.$set(this.urlOptions.optionArr, `arr${index}`, res.list) + }) + .catch(() => { + }); + }); + }, + // 表单提交 + dataFormSubmit() { + this.$refs["dataForm"].validate((valid) => { + if (!valid) { + return false; + } + // 修改的提交 + if (this.dataForm.id) { + this.urlOptions.updateURL(this.dataForm).then(response => { + this.$modal.msgSuccess("修改成功"); + this.visible = false; + this.$emit("refreshDataList"); + }); + return; + } + // 添加的提交 + this.urlOptions.createURL(this.dataForm).then(response => { + this.$modal.msgSuccess("新增成功"); + this.visible = false; + this.$emit("refreshDataList"); + }); + }); + }, + formClear() { + this.$refs.dataForm.resetFields() + } + } +} diff --git a/src/views/base/mixins/basic-page.js b/src/views/base/mixins/basic-page.js new file mode 100644 index 00000000..06c2b851 --- /dev/null +++ b/src/views/base/mixins/basic-page.js @@ -0,0 +1,169 @@ +/* + * @Author: zwq + * @Date: 2022-08-24 11:19:43 + * @LastEditors: zhp + * @LastEditTime: 2023-11-24 09:29:36 + * @Description: + */ +export default { + data() { + /* eslint-disable */ + return { + urlOptions: { + getDataListURL: '', + deleteURL: '', + statusUrl: '', + exportURL: '' + }, + tableData: [], + listQuery: { + pageSize: 10, + pageNo: 1, + total: 1, + }, + exportLoading: false, + dataListLoading: false, + addOrEditTitle: '', + addOrUpdateVisible: false, + } + }, + 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.addOrUpdateVisible = true; + this.$nextTick(() => { + this.$refs.addOrUpdate.init(id); + }); + }, + cancel(id) { + this.$refs["popover-" + id].showPopper = false; + }, + //改变状态 + changeStatus(id) { + this.$http + .post(this.urlOptions.statusUrl, { id }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } + this.$refs["popover-" + id].showPopper = false; + this.$message({ + message: this.$t("prompt.success"), + type: "success", + duration: 500, + onClose: () => { + this.getDataList(); + }, + }); + }) + .catch(() => { }); + }, + //tableBtn点击 + handleClick(val) { + console.log(val.data.packagingCode); + 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,val.data.packagingCode ) + } else if (val.type === "change") { + this.changeStatus(val.data.id) + } 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(() => { }); + }, + //search-bar点击 + buttonClick(val) { + switch (val.btnName) { + case "search": + this.listQuery.xm1 = val.xm1; + this.listQuery.xm2 = val.xm2; + this.listQuery.pageNo = 1; + this.getDataList(); + break; + case "add": + this.addOrEditTitle = '新增' + this.addOrUpdateVisible = true; + this.addOrUpdateHandle() + break; + default: + console.log(val) + } + }, + handleCancel() { + this.$refs.addOrUpdate.formClear() + this.addOrUpdateVisible = false + this.addOrEditTitle = '' + }, + handleConfirm() { + this.$refs.addOrUpdate.dataFormSubmit() + }, + 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(() => { }); + } + } +} diff --git a/src/views/base/mixins/code-filter.js b/src/views/base/mixins/code-filter.js new file mode 100644 index 00000000..30c5f12e --- /dev/null +++ b/src/views/base/mixins/code-filter.js @@ -0,0 +1,69 @@ + +/* + * @Date: 2020-12-29 16:49:28 + * @LastEditors: DY + * @LastEditTime: 2023-09-12 11:13:34 + * @FilePath: \basic-admin\src\filters\basicData\index.js + * @Description: + */ + +const table = { + lineStatus: { + 1: '生产中', + 2: '停止', + 3: '未知', + }, + reportType: { + 1: '日', + 2: '周', + 3: '月' + } +} + +// 日期格式化 +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() + } + 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 default function (dictTable) { + return function (val) { + return table?.[dictTable]?.[val] + } +} diff --git a/src/views/base/packagingPrintLog/SmallTitle.vue b/src/views/base/packagingPrintLog/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/packagingPrintLog/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/packagingPrintLog/add-or-updata.vue b/src/views/base/packagingPrintLog/add-or-updata.vue new file mode 100644 index 00000000..6b1d63b4 --- /dev/null +++ b/src/views/base/packagingPrintLog/add-or-updata.vue @@ -0,0 +1,418 @@ + + + + + + diff --git a/src/views/base/packagingPrintLog/index.vue b/src/views/base/packagingPrintLog/index.vue new file mode 100644 index 00000000..3e4ec4ea --- /dev/null +++ b/src/views/base/packagingPrintLog/index.vue @@ -0,0 +1,356 @@ + + + + diff --git a/src/views/base/packagingPrintLog/unitDict.vue b/src/views/base/packagingPrintLog/unitDict.vue new file mode 100644 index 00000000..94702ab4 --- /dev/null +++ b/src/views/base/packagingPrintLog/unitDict.vue @@ -0,0 +1,15 @@ + + diff --git a/src/views/base/packagingPrintModel/SmallTitle.vue b/src/views/base/packagingPrintModel/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/packagingPrintModel/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/packagingPrintModel/add-or-updata.vue b/src/views/base/packagingPrintModel/add-or-updata.vue new file mode 100644 index 00000000..9e66ebe9 --- /dev/null +++ b/src/views/base/packagingPrintModel/add-or-updata.vue @@ -0,0 +1,441 @@ + + + + + + diff --git a/src/views/base/packagingPrintModel/index.vue b/src/views/base/packagingPrintModel/index.vue new file mode 100644 index 00000000..92fa73ec --- /dev/null +++ b/src/views/base/packagingPrintModel/index.vue @@ -0,0 +1,214 @@ + + + + diff --git a/src/views/base/packagingPrintModel/unitDict.vue b/src/views/base/packagingPrintModel/unitDict.vue new file mode 100644 index 00000000..94702ab4 --- /dev/null +++ b/src/views/base/packagingPrintModel/unitDict.vue @@ -0,0 +1,15 @@ + + diff --git a/src/views/base/packagingPrintType/SmallTitle.vue b/src/views/base/packagingPrintType/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/packagingPrintType/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/packagingPrintType/add-or-updata.vue b/src/views/base/packagingPrintType/add-or-updata.vue new file mode 100644 index 00000000..469b5622 --- /dev/null +++ b/src/views/base/packagingPrintType/add-or-updata.vue @@ -0,0 +1,347 @@ + + + + + + diff --git a/src/views/base/packagingPrintType/index.vue b/src/views/base/packagingPrintType/index.vue new file mode 100644 index 00000000..740d250a --- /dev/null +++ b/src/views/base/packagingPrintType/index.vue @@ -0,0 +1,191 @@ + + + + diff --git a/src/views/base/packagingPrintType/unitDict.vue b/src/views/base/packagingPrintType/unitDict.vue new file mode 100644 index 00000000..94702ab4 --- /dev/null +++ b/src/views/base/packagingPrintType/unitDict.vue @@ -0,0 +1,15 @@ + + diff --git a/src/views/choicePart/components/Navbar.vue b/src/views/choicePart/components/Navbar.vue new file mode 100644 index 00000000..fbee3224 --- /dev/null +++ b/src/views/choicePart/components/Navbar.vue @@ -0,0 +1,24 @@ + + + \ No newline at end of file diff --git a/src/views/choicePart/index.vue b/src/views/choicePart/index.vue new file mode 100644 index 00000000..f77cef0d --- /dev/null +++ b/src/views/choicePart/index.vue @@ -0,0 +1,324 @@ + + + \ No newline at end of file diff --git a/src/views/core/analysis/balanceAnalysis/chart.vue b/src/views/core/analysis/balanceAnalysis/chart.vue new file mode 100644 index 00000000..3df9d162 --- /dev/null +++ b/src/views/core/analysis/balanceAnalysis/chart.vue @@ -0,0 +1,228 @@ + + + + + + + diff --git a/src/views/core/analysis/balanceAnalysis/index copy.vue b/src/views/core/analysis/balanceAnalysis/index copy.vue new file mode 100644 index 00000000..7d5fca73 --- /dev/null +++ b/src/views/core/analysis/balanceAnalysis/index copy.vue @@ -0,0 +1,270 @@ + + + diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue index d9f2ecee..a4877d42 100644 --- a/src/views/core/analysis/balanceAnalysis/index.vue +++ b/src/views/core/analysis/balanceAnalysis/index.vue @@ -1,260 +1,454 @@ + diff --git a/src/views/core/analysis/balanceChart.vue b/src/views/core/analysis/balanceChart.vue index 3fb9cf03..fe156832 100644 --- a/src/views/core/analysis/balanceChart.vue +++ b/src/views/core/analysis/balanceChart.vue @@ -1,134 +1,155 @@ diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue index 6f391ac5..f82d2f80 100644 --- a/src/views/core/analysis/yieldAnalysis/index.vue +++ b/src/views/core/analysis/yieldAnalysis/index.vue @@ -19,8 +19,9 @@ // import basicPage from '../../mixins/basic-page'; import { parseTime } from '../../mixins/code-filter'; import { getYieldAnalysisPageData } from '@/api/core/analysis/index'; -import { getProductionLinePage } from '@/api/core/base/productionLine'; +// import { getProductionLinePage } from '@/api/core/base/productionLine'; import lineChart from '../LineChart' +import moment from 'moment'; // import { getWorkshopSectionPage } from '@/api/core/base/workshopSection'; // const tableProps = [ @@ -58,26 +59,28 @@ export default { dataListLoading:false, tableData: [], listQuery: { - lineIds: [], - time: '' + // lineIds: [], + recordTime: [] }, dateLabelList: [], - optionArrUrl: [getProductionLinePage ], + tempTtime: '', + day: 0, + xData: [], formConfig: [ - { - type: 'select', - label: '产线', - selectOptions: [], - param: 'lineIds', - defaultSelect: '', - multiple:true, - filterable: true, - }, + // { + // type: 'select', + // label: '产线', + // selectOptions: [], + // param: 'lineIds', + // defaultSelect: '', + // multiple:true, + // filterable: true, + // }, { type: 'datePicker', label: '时间', dateType: 'month', - format: 'yyyy-MM-dd', + format: 'yyyy-MM', valueFormat: 'yyyy-MM-dd HH:mm:ss', rangeSeparator: '-', startPlaceholder: '开始时间', @@ -94,135 +97,90 @@ export default { }; }, created() { - this.getArr(); + // this.getArr(); }, methods: { - getArr() { - const params = { - page: 1, - limit: 500, - }; - this.optionArrUrl.forEach((item, index) => { - item(params).then((response) => { - this.formConfig[index].selectOptions = response.data.list - // this.formConfig[0].defaultSelect = response.data.list[0].id - this.$set(this.formConfig[0], 'defaultSelect', response.data.list[0].id) - }); - }); + // getArr() { + // const params = { + // page: 1, + // limit: 500, + // }; + // this.optionArrUrl.forEach((item, index) => { + // item(params).then((response) => { + // this.formConfig[index].selectOptions = response.data.list + // // this.formConfig[0].defaultSelect = response.data.list[0].id + // this.$set(this.formConfig[0], 'defaultSelect', response.data.list[0].id) + // }); + // }); + // }, + // 设置表头和横坐标 + setHeader() { + const month = this.tempTtime.getMonth() + 1 + let arr = [ + { + prop: 'proName', + label: '产品名称', + fixed: 'left' + }, + { + prop: 'specifications', + label: '产品规格', + fixed: 'left' + }, + { + prop: 'sum', + label: '合计', + fixed: 'left' + }, + { + label: this.tempTtime.getFullYear() + '年' + month + '月', + align: 'center', + children: [] + } + ] + for (let d = 1; d <= this.day; d ++) { + arr[3].children.push({ + prop: 'value' + d, label: month + '-' + d + }) + // 横坐标 + this.xData.push(month + '-' + d) + } + this.tableProps = arr }, getData() { - // this.listQuery.lineIds = ['1672847052717821953'] - // this.listQuery.productId = val.productId; - // this.listQuery.time = '1694486098000'; this.urlOptions.getDataListURL(this.listQuery).then(res => { - let arr = [ - { - prop: 'lineName', - label: '产线', - fixed: 'left' - }, - { - prop: 'sum', - label: '合计', - fixed: 'left' - }, - { - prop: res.data ? res.data.nameData[0].name : undefined, - label: res.data ? res.data.nameData[0].name : undefined, - align: 'center', - children:[ - - ] - } - ] - // console.log(res.data.nameData.slice(1)) - let xData = [] - let yAllData = [] - let lineName = [] - if (res.data) { - let tempDateList = [] - res.data.nameData.forEach(date => { - tempDateList.push(date.name) - }) - this.dateLabelList = Array.from(new Set(tempDateList)) - - this.dateLabelList.forEach(item => { - if (item.indexOf('年') === -1) { - // 构造表头 - const props = { - 'prop': item, - 'label': item - } - arr[2].children.push(props) - - // 构造echarts横坐标 - xData.push(item) - } - }) - // res.data.nameData.slice(1).forEach(item => { - // const props = { - // 'prop': item.name, - // 'label': item.name, - // 'align': 'center' - // } - // arr[2].children.push(props) - // }) - let tableDataArr =[] - res.data.data.forEach(item => { - let obj = {} - obj.lineName= item.lineName, - obj.sum= item.sum, - item.data.forEach((ele, index) => { - // console.log(ele) - ele.children.forEach((e) => { - console.log(e.dynamicName) - obj['' + e.dynamicName + ''] = e.dynamicValue - console.log(obj['' + e.dynamicName + '']); - }) - }) - tableDataArr.push(obj) - }); - this.tableData = tableDataArr - this.tableProps = arr - - // let tempList = [] - // res.data.nameData.slice(1).forEach(item => { - // tempList.push(item.name) - // // arr[2].children.push(props) - // }) - // xData = Array.from(new Set(tempList)) - - res.data.data.forEach(item => { + //构造数据 + this.tableData = [] + if (Object.values(res.data.coreProductionLineMonthVOS).length > 0) { + this.setHeader() + let yAllData = [], proNameList = [] + Object.values(res.data.coreProductionLineMonthVOS).forEach(pro => { + // 一条产品的数据 let yData = [] - lineName.push(item.lineName) - // let obj = {} - // obj.lineName = item.lineName, - // obj.sum = item.sum, - item.data.forEach((ele, index) => { - // console.log(ele) - ele.children.forEach((e) => { - // let yData = [] - yData.push(e.dynamicValue) - }) - }) + const tempData = { + proName: pro[0].proName, + specifications: pro[0].specifications, + sum: 0 + } + proNameList.push(pro[0].proName) + pro.forEach(item => { + // 产品下的各时间点的数据 + // 截取日 + const day = parseTime(item.recordTime).slice(8, 10) < 10 ? parseTime(item.recordTime).slice(9, 10) : parseTime(item.recordTime).slice(8, 10) + // console.log('!1', day < 10) + tempData['value' + day] = item.countSum + tempData.sum += item.countSum + yData[day] = item.countSum + // yData.push(item.countSum) + }) + this.tableData.push(tempData) yAllData.push(yData) - }); - console.log(lineName) - } else { - this.tableProps = arr - this.tableData = [] - xData = [] - yAllData = [] - lineName = [] + }) + this.$nextTick(() => { + this.$refs.lineChart.initChart(this.xData, yAllData, proNameList) + }) } - // res.data.data[0].data[0].children.forEach((item, index) => { - // // console.log(item) - // yData.push(item.dynamicValue) - // // let data = 'data' + Number(index+1) - // // obj['' + item.dynamicName + ''] = item.dynamicValue - // }) - // console.log(this.yData) - this.$refs.lineChart.initChart(xData, yAllData, lineName) + // this.total = response.data.total; // this.dataListLoading = false; }); @@ -230,12 +188,24 @@ export default { buttonClick(val) { switch (val.btnName) { case 'search': - this.listQuery.lineIds = val.lineIds ? val.lineIds :undefined - // this.listQuery.productId = val.productId; - this.listQuery.time = val.time ? new Date(val.time).getTime() : undefined - // this.listQuery.pageNo = 1; - // this.listQuery.pageSize = 10; + // this.listQuery.recordTime = val.time ? new Date(val.time).getTime() : undefined if (val.time) { + this.tempTtime = new Date(val.time) + switch (this.tempTtime.getMonth() + 1) { + case 1, 3, 5, 7, 8, 10, 12: + this.day = 31; + break; + case 2: + this.day = 28; + break; + case 4, 6, 9, 11: + this.day = 30; + break; + } + this.listQuery.recordTime = [ + val.time, + parseTime(new Date(this.tempTtime.getFullYear(), this.tempTtime.getMonth(), this.day, 23, 59, 59)) + ] this.getData() } else { this.$message({ diff --git a/src/views/core/base/equipment/assets/eq1.jpg b/src/views/core/base/equipment/assets/eq1.jpg deleted file mode 100644 index e62db64c..00000000 Binary files a/src/views/core/base/equipment/assets/eq1.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq10.jpg b/src/views/core/base/equipment/assets/eq10.jpg deleted file mode 100644 index 1f738260..00000000 Binary files a/src/views/core/base/equipment/assets/eq10.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq2.jpg b/src/views/core/base/equipment/assets/eq2.jpg deleted file mode 100644 index 7ca5dcc1..00000000 Binary files a/src/views/core/base/equipment/assets/eq2.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq3.jpg b/src/views/core/base/equipment/assets/eq3.jpg deleted file mode 100644 index 45f23067..00000000 Binary files a/src/views/core/base/equipment/assets/eq3.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq4.jpg b/src/views/core/base/equipment/assets/eq4.jpg deleted file mode 100644 index 51476968..00000000 Binary files a/src/views/core/base/equipment/assets/eq4.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq5.jpg b/src/views/core/base/equipment/assets/eq5.jpg deleted file mode 100644 index 8e536163..00000000 Binary files a/src/views/core/base/equipment/assets/eq5.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq6.jpg b/src/views/core/base/equipment/assets/eq6.jpg deleted file mode 100644 index 256ec18e..00000000 Binary files a/src/views/core/base/equipment/assets/eq6.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq7.jpg b/src/views/core/base/equipment/assets/eq7.jpg deleted file mode 100644 index 3fae2905..00000000 Binary files a/src/views/core/base/equipment/assets/eq7.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq8.jpg b/src/views/core/base/equipment/assets/eq8.jpg deleted file mode 100644 index ff3c2c39..00000000 Binary files a/src/views/core/base/equipment/assets/eq8.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq9.jpg b/src/views/core/base/equipment/assets/eq9.jpg deleted file mode 100644 index 93754f39..00000000 Binary files a/src/views/core/base/equipment/assets/eq9.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/components/EquipmentAssets.vue b/src/views/core/base/equipment/components/EquipmentAssets.vue deleted file mode 100644 index aa7b92b8..00000000 --- a/src/views/core/base/equipment/components/EquipmentAssets.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - diff --git a/src/views/core/base/equipment/components/EquipmentPics.vue b/src/views/core/base/equipment/components/EquipmentPics.vue deleted file mode 100644 index 9c4b1f92..00000000 --- a/src/views/core/base/equipment/components/EquipmentPics.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - diff --git a/src/views/core/base/factory/add-or-updata.vue b/src/views/core/base/factory/add-or-updata.vue index ef05b5f0..0afeb881 100644 --- a/src/views/core/base/factory/add-or-updata.vue +++ b/src/views/core/base/factory/add-or-updata.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: DY - * @LastEditTime: 2023-10-16 11:16:48 + * @LastEditTime: 2023-11-03 16:32:52 * @Description: --> diff --git a/src/views/base/equipmentBindGroup/index.vue b/src/views/equipment/base/config/BindGroup/index.vue similarity index 88% rename from src/views/base/equipmentBindGroup/index.vue rename to src/views/equipment/base/config/BindGroup/index.vue index e504c804..03cd2c9d 100644 --- a/src/views/base/equipmentBindGroup/index.vue +++ b/src/views/equipment/base/config/BindGroup/index.vue @@ -34,17 +34,18 @@ - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/equipment/base/config/DataCollection/TableConfig.vue b/src/views/equipment/base/config/DataCollection/TableConfig.vue new file mode 100644 index 00000000..1037d075 --- /dev/null +++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue @@ -0,0 +1,397 @@ + + + + + diff --git a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue new file mode 100644 index 00000000..4ac442ce --- /dev/null +++ b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue @@ -0,0 +1,668 @@ + + + + + + + diff --git a/src/views/equipment/base/inspection/Content/index.vue b/src/views/equipment/base/inspection/Content/index.vue new file mode 100644 index 00000000..e79cf7b7 --- /dev/null +++ b/src/views/equipment/base/inspection/Content/index.vue @@ -0,0 +1,320 @@ + + + diff --git a/src/views/equipment/base/inspection/Record/addRecord.vue b/src/views/equipment/base/inspection/Record/addRecord.vue new file mode 100644 index 00000000..f420896b --- /dev/null +++ b/src/views/equipment/base/inspection/Record/addRecord.vue @@ -0,0 +1,406 @@ + + + + + + + diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue new file mode 100644 index 00000000..4d822298 --- /dev/null +++ b/src/views/equipment/base/inspection/Record/index.vue @@ -0,0 +1,389 @@ + + + diff --git a/src/views/equipment/base/inspection/Settings/SmallTitle.vue b/src/views/equipment/base/inspection/Settings/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/equipment/base/inspection/Settings/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/equipment/base/inspection/Settings/add-or-updata.vue b/src/views/equipment/base/inspection/Settings/add-or-updata.vue new file mode 100644 index 00000000..1f980d48 --- /dev/null +++ b/src/views/equipment/base/inspection/Settings/add-or-updata.vue @@ -0,0 +1,312 @@ + + + + + diff --git a/src/views/equipment/base/inspection/Settings/add.vue b/src/views/equipment/base/inspection/Settings/add.vue new file mode 100644 index 00000000..bfc656d3 --- /dev/null +++ b/src/views/equipment/base/inspection/Settings/add.vue @@ -0,0 +1,105 @@ + + + + diff --git a/src/views/equipment/base/inspection/Settings/attr-add.vue b/src/views/equipment/base/inspection/Settings/attr-add.vue new file mode 100644 index 00000000..d80cdb5b --- /dev/null +++ b/src/views/equipment/base/inspection/Settings/attr-add.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/equipment/base/inspection/Settings/index.vue b/src/views/equipment/base/inspection/Settings/index.vue new file mode 100644 index 00000000..e3ce20b4 --- /dev/null +++ b/src/views/equipment/base/inspection/Settings/index.vue @@ -0,0 +1,375 @@ + + + diff --git a/src/views/equipment/base/maintain/Monitor/index.vue b/src/views/equipment/base/maintain/Monitor/index.vue new file mode 100644 index 00000000..c2e3f957 --- /dev/null +++ b/src/views/equipment/base/maintain/Monitor/index.vue @@ -0,0 +1,371 @@ + + + diff --git a/src/views/equipment/base/maintain/PlanConfig/index.vue b/src/views/equipment/base/maintain/PlanConfig/index.vue new file mode 100644 index 00000000..76f399a7 --- /dev/null +++ b/src/views/equipment/base/maintain/PlanConfig/index.vue @@ -0,0 +1,374 @@ + + + diff --git a/src/views/equipment/base/maintain/Record/index.vue b/src/views/equipment/base/maintain/Record/index.vue new file mode 100644 index 00000000..f33df532 --- /dev/null +++ b/src/views/equipment/base/maintain/Record/index.vue @@ -0,0 +1,518 @@ + + + diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue new file mode 100644 index 00000000..7649f3ee --- /dev/null +++ b/src/views/equipment/base/repair/CustomDialogForm.vue @@ -0,0 +1,345 @@ + + + + + + + diff --git a/src/views/equipment/base/repair/index.vue b/src/views/equipment/base/repair/index.vue new file mode 100644 index 00000000..fe7c4768 --- /dev/null +++ b/src/views/equipment/base/repair/index.vue @@ -0,0 +1,453 @@ + + + diff --git a/src/views/equipment/base/spareParts/Config/addSparts.vue b/src/views/equipment/base/spareParts/Config/addSparts.vue new file mode 100644 index 00000000..85975edd --- /dev/null +++ b/src/views/equipment/base/spareParts/Config/addSparts.vue @@ -0,0 +1,315 @@ + + + + + + + diff --git a/src/views/equipment/base/spareParts/Config/attr-add.vue b/src/views/equipment/base/spareParts/Config/attr-add.vue new file mode 100644 index 00000000..8b3672d9 --- /dev/null +++ b/src/views/equipment/base/spareParts/Config/attr-add.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/equipment/base/spareParts/Config/htmls.vue b/src/views/equipment/base/spareParts/Config/htmls.vue new file mode 100644 index 00000000..e174164b --- /dev/null +++ b/src/views/equipment/base/spareParts/Config/htmls.vue @@ -0,0 +1,36 @@ + + + + diff --git a/src/views/equipment/base/spareParts/Config/index.vue b/src/views/equipment/base/spareParts/Config/index.vue new file mode 100644 index 00000000..d76d9616 --- /dev/null +++ b/src/views/equipment/base/spareParts/Config/index.vue @@ -0,0 +1,379 @@ + + + diff --git a/src/views/equipment/base/spareParts/List/index.vue b/src/views/equipment/base/spareParts/List/index.vue new file mode 100644 index 00000000..10bd5dcc --- /dev/null +++ b/src/views/equipment/base/spareParts/List/index.vue @@ -0,0 +1,380 @@ + + + diff --git a/src/views/equipment/base/spareParts/Monitor/addSparts.vue b/src/views/equipment/base/spareParts/Monitor/addSparts.vue new file mode 100644 index 00000000..a39a8dc5 --- /dev/null +++ b/src/views/equipment/base/spareParts/Monitor/addSparts.vue @@ -0,0 +1,432 @@ + + + + + + + diff --git a/src/views/equipment/base/spareParts/Monitor/attr-add.vue b/src/views/equipment/base/spareParts/Monitor/attr-add.vue new file mode 100644 index 00000000..d4cb5219 --- /dev/null +++ b/src/views/equipment/base/spareParts/Monitor/attr-add.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/src/views/equipment/base/spareParts/Monitor/index.vue b/src/views/equipment/base/spareParts/Monitor/index.vue new file mode 100644 index 00000000..e11c65e0 --- /dev/null +++ b/src/views/equipment/base/spareParts/Monitor/index.vue @@ -0,0 +1,452 @@ + + + diff --git a/src/views/equipment/monitor/SearchBar.vue b/src/views/equipment/monitor/SearchBar.vue new file mode 100644 index 00000000..1cc50e7c --- /dev/null +++ b/src/views/equipment/monitor/SearchBar.vue @@ -0,0 +1,147 @@ + + + + + + + diff --git a/src/views/equipment/monitor/StatusAndParams/index.vue b/src/views/equipment/monitor/StatusAndParams/index.vue new file mode 100644 index 00000000..e3f0fe1d --- /dev/null +++ b/src/views/equipment/monitor/StatusAndParams/index.vue @@ -0,0 +1,302 @@ + + + diff --git a/src/views/equipment/timing-diagram/output/index.vue b/src/views/equipment/timing-diagram/output/index.vue index d1a495ae..5b4f6ec1 100644 --- a/src/views/equipment/timing-diagram/output/index.vue +++ b/src/views/equipment/timing-diagram/output/index.vue @@ -61,6 +61,8 @@ v-if="open" style="width: 100%" v-model="queryParams.equipmentId" + filterable + clearable placeholder="请选择一个设备"> + \ No newline at end of file diff --git a/src/views/group/monitoring/groupTeamView/index.vue b/src/views/group/monitoring/groupTeamView/index.vue new file mode 100644 index 00000000..6a172aed --- /dev/null +++ b/src/views/group/monitoring/groupTeamView/index.vue @@ -0,0 +1,143 @@ + + \ No newline at end of file diff --git a/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue b/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue new file mode 100644 index 00000000..a681e8c0 --- /dev/null +++ b/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue @@ -0,0 +1,162 @@ + + + \ No newline at end of file diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue new file mode 100644 index 00000000..2fc7f884 --- /dev/null +++ b/src/views/group/monitoring/teamProduction/index.vue @@ -0,0 +1,172 @@ + + \ No newline at end of file diff --git a/src/views/login.vue b/src/views/login.vue index 401be7aa..4434c6eb 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,81 +1,158 @@ + :deep(.el-input__prefix) { + top: 22%; + } +} +.form-cont { + padding-top: 40px; +} + diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue index 4e681abe..463c788c 100644 --- a/src/views/monitoring/equipmentFullParams/index.vue +++ b/src/views/monitoring/equipmentFullParams/index.vue @@ -35,12 +35,12 @@ " /> -
    -
    +
    \ No newline at end of file diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue new file mode 100644 index 00000000..df871a9e --- /dev/null +++ b/src/views/order/base/orderManage/components/orderAdd.vue @@ -0,0 +1,293 @@ + + \ No newline at end of file diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue new file mode 100644 index 00000000..b398b76e --- /dev/null +++ b/src/views/order/base/orderManage/index.vue @@ -0,0 +1,470 @@ + + \ No newline at end of file diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue new file mode 100644 index 00000000..cffafbe2 --- /dev/null +++ b/src/views/order/base/orderManage/orderDetailData.vue @@ -0,0 +1,343 @@ + + + \ No newline at end of file diff --git a/src/views/order/monitoring/components/monitoringRingCharts.vue b/src/views/order/monitoring/components/monitoringRingCharts.vue new file mode 100644 index 00000000..54a55a19 --- /dev/null +++ b/src/views/order/monitoring/components/monitoringRingCharts.vue @@ -0,0 +1,168 @@ + + + \ No newline at end of file diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue new file mode 100644 index 00000000..b2a469cd --- /dev/null +++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue @@ -0,0 +1,371 @@ + + + \ No newline at end of file diff --git a/src/views/print/design.vue b/src/views/print/design.vue index 97e31726..cf15a7c3 100644 --- a/src/views/print/design.vue +++ b/src/views/print/design.vue @@ -1,4 +1,4 @@ - + + + + + + diff --git a/src/views/quality/base/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue similarity index 92% rename from src/views/quality/base/qualityInspectionBoxBtn/index.vue rename to src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue index 4fbe6656..a169cd13 100644 --- a/src/views/quality/base/qualityInspectionBoxBtn/index.vue +++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue @@ -70,7 +70,7 @@ export default { label: '产线', url: '/base/production-line/listAll', prop: 'productionId', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }], bind: { filterable: true, }, @@ -80,7 +80,7 @@ export default { label: '工段', url: '/base/workshop-section/listAll', prop: 'sectionId', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }], bind: { filterable: true, }, @@ -118,13 +118,17 @@ export default { }, ], bind: { type: 'number', min: 0, max: 100 }, - }, - { - textarea: true, - label: '检测内容', - prop: 'inspectionDetContent', - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], - }, + }, + { + select: true, + label: '检测内容', + url: '/base/quality-inspection-det/listAll', + prop: 'inspectionDetId', + rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + bind: { + filterable: true, + }, + }, ], ], searchBarFormConfig: [ @@ -176,7 +180,7 @@ export default { filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, { - prop: 'productionName', + prop: 'productionLineName', label: '产线', }, { @@ -218,8 +222,8 @@ export default { form: { id: null, buttonId: null, - inspectionDetContent: null, - productionId: null, + inspectionDetId: null, + productionLineId: null, sectionId: null, model: null, keyValue: null, diff --git a/src/views/quality/base/qualityInspectionBoxBtn/dialogForm.vue b/src/views/quality/base/qualityInspectionBoxBtn/dialogForm.vue deleted file mode 100644 index 92a1c646..00000000 --- a/src/views/quality/base/qualityInspectionBoxBtn/dialogForm.vue +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue index a5518679..602f9fb2 100644 --- a/src/views/quality/base/qualityInspectionDet/index.vue +++ b/src/views/quality/base/qualityInspectionDet/index.vue @@ -1,81 +1,53 @@ diff --git a/src/views/quality/base/qualityScrapDet/index.vue b/src/views/quality/base/qualityScrapDet/index.vue new file mode 100644 index 00000000..6e9276aa --- /dev/null +++ b/src/views/quality/base/qualityScrapDet/index.vue @@ -0,0 +1,186 @@ + + + diff --git a/src/views/quality/base/qualityScrapLog/SmallTitle.vue b/src/views/quality/base/qualityScrapLog/SmallTitle.vue new file mode 100644 index 00000000..ac529869 --- /dev/null +++ b/src/views/quality/base/qualityScrapLog/SmallTitle.vue @@ -0,0 +1,72 @@ + + + + + + + diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue new file mode 100644 index 00000000..bcfc9530 --- /dev/null +++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue @@ -0,0 +1,209 @@ + + + + diff --git a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue new file mode 100644 index 00000000..a689f27f --- /dev/null +++ b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue @@ -0,0 +1,222 @@ + + + + diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue new file mode 100644 index 00000000..5237cb8d --- /dev/null +++ b/src/views/quality/base/qualityScrapLog/index.vue @@ -0,0 +1,213 @@ + + + diff --git a/src/views/quality/base/qualityScrapType/add-or-updata.vue b/src/views/quality/base/qualityScrapType/add-or-updata.vue new file mode 100644 index 00000000..6ef00826 --- /dev/null +++ b/src/views/quality/base/qualityScrapType/add-or-updata.vue @@ -0,0 +1,86 @@ + + + + diff --git a/src/views/quality/base/qualityScrapType/index.vue b/src/views/quality/base/qualityScrapType/index.vue new file mode 100644 index 00000000..6d638e83 --- /dev/null +++ b/src/views/quality/base/qualityScrapType/index.vue @@ -0,0 +1,169 @@ + + + diff --git a/src/views/quality/monitoring/currentData/dialogForm.vue b/src/views/quality/monitoring/currentData/dialogForm.vue new file mode 100644 index 00000000..be2f7c74 --- /dev/null +++ b/src/views/quality/monitoring/currentData/dialogForm.vue @@ -0,0 +1,270 @@ + + + + + + + diff --git a/src/views/quality/monitoring/currentData/index.vue b/src/views/quality/monitoring/currentData/index.vue new file mode 100644 index 00000000..0125ab85 --- /dev/null +++ b/src/views/quality/monitoring/currentData/index.vue @@ -0,0 +1,622 @@ + + + + diff --git a/src/views/quality/monitoring/deviceParameters/components/pieChart.vue b/src/views/quality/monitoring/deviceParameters/components/pieChart.vue new file mode 100644 index 00000000..249e5b3b --- /dev/null +++ b/src/views/quality/monitoring/deviceParameters/components/pieChart.vue @@ -0,0 +1,279 @@ + + + + + + + diff --git a/src/views/quality/monitoring/deviceParameters/index.vue b/src/views/quality/monitoring/deviceParameters/index.vue new file mode 100644 index 00000000..1146b523 --- /dev/null +++ b/src/views/quality/monitoring/deviceParameters/index.vue @@ -0,0 +1,714 @@ + + + + + + + + + diff --git a/src/views/quality/monitoring/deviceParameters/utils/local-data-manager.js b/src/views/quality/monitoring/deviceParameters/utils/local-data-manager.js new file mode 100644 index 00000000..5d8c76fd --- /dev/null +++ b/src/views/quality/monitoring/deviceParameters/utils/local-data-manager.js @@ -0,0 +1,36 @@ +export default class LocalDataManager { + constructor(dataList, pageNo, pageSize) { + this._dataListStore = dataList; + this._pageNo = pageNo; + this._pageSize = pageSize; + } + + set pageNo(pageNo) { + console.log('set pageNo', pageNo); + this._pageNo = pageNo; + } + + set pageSize(pageSize) { + console.log('set pageSize', pageSize); + this._pageSize = pageSize; + } + + get dataList() { + const firstLine = this._dataListStore[0]; + const realDataList = this._dataListStore.slice(1); + return [ + firstLine, + ...realDataList.slice((this._pageNo - 1) * this._pageSize, this._pageNo * this._pageSize) + ] + } + + get total() { + return this._dataListStore.length; + } + + deleteData(id) { + const idx = this._dataListStore.findIndex(item => item.id == id); + this._dataListStore.splice(idx, 1); + // send http request + } +} \ No newline at end of file diff --git a/src/views/quality/monitoring/equipmentTraceability/components/pieChart.vue b/src/views/quality/monitoring/equipmentTraceability/components/pieChart.vue new file mode 100644 index 00000000..249e5b3b --- /dev/null +++ b/src/views/quality/monitoring/equipmentTraceability/components/pieChart.vue @@ -0,0 +1,279 @@ + + + + + + + diff --git a/src/views/quality/monitoring/equipmentTraceability/index.vue b/src/views/quality/monitoring/equipmentTraceability/index.vue new file mode 100644 index 00000000..c88a7f60 --- /dev/null +++ b/src/views/quality/monitoring/equipmentTraceability/index.vue @@ -0,0 +1,576 @@ + + + + + + + diff --git a/src/views/quality/monitoring/materielDateFrom/index.vue b/src/views/quality/monitoring/materielDateFrom/index.vue new file mode 100644 index 00000000..07efb7d2 --- /dev/null +++ b/src/views/quality/monitoring/materielDateFrom/index.vue @@ -0,0 +1,251 @@ + + + + diff --git a/src/views/quality/monitoring/mixins/basic-add.js b/src/views/quality/monitoring/mixins/basic-add.js new file mode 100644 index 00000000..0b9acd23 --- /dev/null +++ b/src/views/quality/monitoring/mixins/basic-add.js @@ -0,0 +1,100 @@ +/* + * @Author: zwq + * @Date: 2022-08-24 11:19:43 + * @LastEditors: zwq + * @LastEditTime: 2023-08-03 14:21:04 + * @Description: + */ +export default { + data() { + /* eslint-disable */ + return { + urlOptions: { + createURL: '', + updateURL: '', + infoURL: '', + codeURL: '', + getOption: false, + isGetCode: false, + optionArrUrl: [], + optionArr: {} + }, + visible: false, + setData: false + } + }, + created() { + }, + activated() { + }, + methods: { + init(id) { + this.dataForm.id = id || ""; + this.visible = true; + if (this.urlOptions.getOption) { + this.getArr() + } + this.$nextTick(() => { + this.$refs["dataForm"].resetFields(); + if (this.dataForm.id) { + this.urlOptions.infoURL(id).then(response => { + this.dataForm = response.data; + if (this.setData) { + this.setDataForm() + } + }); + } else { + if (this.urlOptions.isGetCode) { + this.getCode() + } + } + }); + }, + getCode() { + this.urlOptions.codeURL() + .then(({ data: res }) => { + this.dataForm.code = res; + }) + .catch(() => {}); + }, + getArr() { + const params = { + pageSize: 100, + pageNo: 1, + } + this.urlOptions.optionArrUrl.forEach((item, index) => { + item(params).then(({ data: res }) => { + this.$set(this.urlOptions.optionArr, `arr${index}`, res.list) + }) + .catch(() => { + }); + }); + }, + // 表单提交 + dataFormSubmit() { + this.$refs["dataForm"].validate((valid) => { + if (!valid) { + return false; + } + // 修改的提交 + if (this.dataForm.id) { + this.urlOptions.updateURL(this.dataForm).then(response => { + this.$modal.msgSuccess("修改成功"); + this.visible = false; + this.$emit("refreshDataList"); + }); + return; + } + // 添加的提交 + this.urlOptions.createURL(this.dataForm).then(response => { + this.$modal.msgSuccess("新增成功"); + this.visible = false; + this.$emit("refreshDataList"); + }); + }); + }, + formClear() { + this.$refs.dataForm.resetFields() + } + } +} diff --git a/src/views/quality/monitoring/mixins/basic-page.js b/src/views/quality/monitoring/mixins/basic-page.js new file mode 100644 index 00000000..8723be82 --- /dev/null +++ b/src/views/quality/monitoring/mixins/basic-page.js @@ -0,0 +1,168 @@ +/* + * @Author: zwq + * @Date: 2022-08-24 11:19:43 + * @LastEditors: DY + * @LastEditTime: 2023-09-21 16:02:07 + * @Description: + */ +export default { + data() { + /* eslint-disable */ + return { + urlOptions: { + getDataListURL: '', + deleteURL: '', + statusUrl: '', + exportURL: '' + }, + tableData: [], + listQuery: { + pageSize: 10, + pageNo: 1, + total: 1, + }, + exportLoading: false, + dataListLoading: false, + addOrEditTitle: '', + addOrUpdateVisible: false, + } + }, + 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.addOrUpdateVisible = true; + this.$nextTick(() => { + this.$refs.addOrUpdate.init(id); + }); + }, + cancel(id) { + this.$refs["popover-" + id].showPopper = false; + }, + //改变状态 + changeStatus(id) { + this.$http + .post(this.urlOptions.statusUrl, { id }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } + this.$refs["popover-" + id].showPopper = false; + this.$message({ + message: this.$t("prompt.success"), + type: "success", + duration: 500, + onClose: () => { + this.getDataList(); + }, + }); + }) + .catch(() => { }); + }, + //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 if (val.type === "change") { + this.changeStatus(val.data.id) + } 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(() => { }); + }, + //search-bar点击 + buttonClick(val) { + switch (val.btnName) { + case "search": + this.listQuery.xm1 = val.xm1; + this.listQuery.xm2 = val.xm2; + this.listQuery.pageNo = 1; + this.getDataList(); + break; + case "add": + this.addOrEditTitle = '新增' + this.addOrUpdateVisible = true; + this.addOrUpdateHandle() + break; + default: + console.log(val) + } + }, + handleCancel() { + this.$refs.addOrUpdate.formClear() + this.addOrUpdateVisible = false + this.addOrEditTitle = '' + }, + handleConfirm() { + this.$refs.addOrUpdate.dataFormSubmit() + }, + 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(() => { }); + } + } +} diff --git a/src/views/quality/monitoring/mixins/code-filter.js b/src/views/quality/monitoring/mixins/code-filter.js new file mode 100644 index 00000000..30c5f12e --- /dev/null +++ b/src/views/quality/monitoring/mixins/code-filter.js @@ -0,0 +1,69 @@ + +/* + * @Date: 2020-12-29 16:49:28 + * @LastEditors: DY + * @LastEditTime: 2023-09-12 11:13:34 + * @FilePath: \basic-admin\src\filters\basicData\index.js + * @Description: + */ + +const table = { + lineStatus: { + 1: '生产中', + 2: '停止', + 3: '未知', + }, + reportType: { + 1: '日', + 2: '周', + 3: '月' + } +} + +// 日期格式化 +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() + } + 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 default function (dictTable) { + return function (val) { + return table?.[dictTable]?.[val] + } +} diff --git a/src/views/quality/monitoring/processTraceability/index.vue b/src/views/quality/monitoring/processTraceability/index.vue new file mode 100644 index 00000000..413e6889 --- /dev/null +++ b/src/views/quality/monitoring/processTraceability/index.vue @@ -0,0 +1,279 @@ + + + + diff --git a/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessBomList.vue b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessBomList.vue new file mode 100644 index 00000000..c1da0893 --- /dev/null +++ b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessBomList.vue @@ -0,0 +1,308 @@ + + + + + + + diff --git a/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessDetail.vue b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessDetail.vue new file mode 100644 index 00000000..88af88ed --- /dev/null +++ b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessDetail.vue @@ -0,0 +1,488 @@ + + + + + + + + + diff --git a/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessInfo.vue b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessInfo.vue new file mode 100644 index 00000000..6fc7073c --- /dev/null +++ b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessInfo.vue @@ -0,0 +1,129 @@ + + + + + + + diff --git a/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessNode.js b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessNode.js new file mode 100644 index 00000000..948aaf24 --- /dev/null +++ b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessNode.js @@ -0,0 +1,170 @@ +import { Node, ObjectExt, Shape } from '@antv/x6'; +import { IdToName } from '@/utils' +import cache from '@/utils/cache' +import axios from '@/utils/request' +import { v4 } from 'uuid' + +Shape.Edge.config({ + attrs: { + line: { + stroke: '#ccc', + strokeWidth: 1, + targetMarker: { + name: 'block', + width: 1, + height: 1 + }, + }, + } +}) + + +export default class ProcessNode extends Node { } +ProcessNode.config({ + width: 200, + height: 100, + markup: [ + { + tagName: 'rect', + selector: 'container', + attrs: { + x: 0, + y: 0, + width: 200, + height: 100, + fill: 'transparent', + stroke: '#ccc' + }, + }, + { + tagName: 'rect', + attrs: { + x: 0, + y: 0, + width: 200, + height: 50, + fill: '#ffffff', + }, + }, + { + tagName: 'rect', + attrs: { + x: 0, + y: 50, + width: 200, + height: 50, + fill: '#f8f8f8', + }, + }, + { + tagName: 'text', + selector: 'detName', + attrs: { + x: 20, + y: 30, + }, + }, + { + tagName: 'text', + selector: 'sectionName', + attrs: { + x: 115, + y: 30, + }, + }, + { + tagName: 'text', + selector: 'detDesc', + attrs: { + x: 26, + y: 80, + fill: '#777', + fontSize: 14, + fill: '#1a90fc', + }, + }, + ], + attrs: { + line: { + fill: 'red' + } + }, + ports: { + groups: { + in: { + position: 'left', + attrs: { + circle: { + r: 2, + magnet: true, + stroke: '#0b58ff', + strokeWidth: 1, + fill: '#0b58ff' + } + } + }, + out: { + position: 'right', + attrs: { + circle: { + r: 2, + magnet: true, + stroke: '#0b58ff', + strokeWidth: 1, + fill: '#0b58ff' + } + } + } + } + }, + propHooks(metadata) { + const { detId, detName, detDesc, sectionName, processId, sectionId, ...others } = metadata; + // debugger; + if (detName) ObjectExt.setByPath(others, 'attrs/detName/text', detName); + if (detDesc) ObjectExt.setByPath(others, 'attrs/detDesc/text', detDesc); + if (sectionName) ObjectExt.setByPath(others, 'attrs/sectionName/text', sectionName); + if (detId) ObjectExt.setByPath(others, 'attrs/detId/text', detId); + if (processId) ObjectExt.setByPath(others, 'attrs/processId/text', processId); + if (sectionId) ObjectExt.setByPath(others, 'attrs/sectionId/text', sectionId); + return others; + } +}); + +export const CACHE_NAME = 'ProcessDetail::section'; + +export async function getSectionFrom(sectionId) { + const sectionList = await cache.getList( + CACHE_NAME, + async () => { + const { code, data } = await axios( + '/base/core-production-line/listAll' + ); + if (code == 0) { + return data; + } + } + ); + return IdToName(sectionId, sectionList); +} + +export async function createProcessNode({ flowId, id, name, sectionId, remark }) { + const sectionName = await getSectionFrom(sectionId); + return { + shape: 'process-node', + x: 0, + y: 0, + detName: name, // 工序名称 + sectionName, // 工段 + sectionId, + detDesc: remark, // 工序说明 + processId: flowId, // 工艺ID + detId: id, // 工序ID + tools: [], + ports: [ + { id: v4(), group: 'in' }, + { id: v4(), group: 'out' }, + ] + }; +} + +export async function createEdge(src, dest) { } \ No newline at end of file diff --git a/src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue b/src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue new file mode 100644 index 00000000..5d34b55b --- /dev/null +++ b/src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue @@ -0,0 +1,72 @@ + + + + + + + diff --git a/src/views/quality/monitoring/processTraceabilityDetail/components/statusBtn.vue b/src/views/quality/monitoring/processTraceabilityDetail/components/statusBtn.vue new file mode 100644 index 00000000..e1b7e319 --- /dev/null +++ b/src/views/quality/monitoring/processTraceabilityDetail/components/statusBtn.vue @@ -0,0 +1,63 @@ + + + + diff --git a/src/views/quality/monitoring/processTraceabilityDetail/index.vue b/src/views/quality/monitoring/processTraceabilityDetail/index.vue new file mode 100644 index 00000000..3d87a88f --- /dev/null +++ b/src/views/quality/monitoring/processTraceabilityDetail/index.vue @@ -0,0 +1,70 @@ + + + + + + + + diff --git a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue index 1d660f8a..9199e2fc 100644 --- a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue +++ b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue @@ -1,4 +1,4 @@ - diff --git a/src/views/quality/monitoring/statisticalData/dialogForm.vue b/src/views/quality/monitoring/statisticalData/dialogForm.vue new file mode 100644 index 00000000..be2f7c74 --- /dev/null +++ b/src/views/quality/monitoring/statisticalData/dialogForm.vue @@ -0,0 +1,270 @@ + + + + + + + diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue new file mode 100644 index 00000000..e4db32b7 --- /dev/null +++ b/src/views/quality/monitoring/statisticalData/index.vue @@ -0,0 +1,459 @@ + + + diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue index 3b968108..5f5e2224 100644 --- a/src/views/report/jmreport/index.vue +++ b/src/views/report/jmreport/index.vue @@ -1,6 +1,13 @@ + @@ -10,9 +17,10 @@ import {getAccessToken} from "@/utils/auth"; export default { name: "JimuReport", components: { iFrame }, + data() { return { - url: process.env.VUE_APP_BASE_API + "/jmreport/list?token=" + getAccessToken(), + url: process.env.VUE_APP_JIMU_API + "/jmreport/list?token=" + getAccessToken(), }; }, }; diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 7890d1a8..cfd96799 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -1,6 +1,6 @@