diff --git a/.env.dev b/.env.dev index 9b0643f4..acb7b2ac 100644 --- a/.env.dev +++ b/.env.dev @@ -1,8 +1,8 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-10-30 10:49:39 - # @LastEditors: zhp + # @LastEditTime: 2023-11-15 14:37:35 + # @LastEditors: DY # @Description: ### # 开发环境配置 @@ -12,15 +12,15 @@ ENV = 'development' VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 - +# VUE_APP_BASE_API = 'http://100.64.0.26:48082' # VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.4.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' -VUE_APP_BASE_API = 'http://192.168.0.33:48082' -# VUE_APP_BASE_API = 'http://192.168.1.188:48080' - - +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +VUE_APP_BASE_API = 'http://192.168.1.56:48080' +# VUE_APP_BASE_API = 'http://192.168.4.159:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true @@ -35,3 +35,4 @@ VUE_APP_DOC_ENABLE = true # 百度统计 # VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab + diff --git a/.env.front b/.env.front index 34f878c2..743152e3 100644 --- a/.env.front +++ b/.env.front @@ -1,3 +1,4 @@ + # 开发环境配置 ENV = 'development' diff --git a/.env.prod b/.env.prod index 10cb8f51..43504e8f 100644 --- a/.env.prod +++ b/.env.prod @@ -2,7 +2,7 @@ ENV = 'production' # 页面标题 -VUE_APP_TITLE = 产线监控系统 +VUE_APP_TITLE = MES系统 # 芋道管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' 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..b25d7a96 100644 --- a/.env.stage +++ b/.env.stage @@ -23,3 +23,4 @@ VUE_APP_DOC_ENABLE = false # 百度统计 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab + diff --git a/public/static/videos/login.webm b/public/static/videos/login.webm new file mode 100644 index 00000000..4ac1bdd2 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/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..ce9cdf64 --- /dev/null +++ b/src/api/base/coreWorkOrder.js @@ -0,0 +1,146 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-15 10:44:41 + * @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 + }) +} 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/delivery.js b/src/api/base/delivery.js new file mode 100644 index 00000000..82c371c3 --- /dev/null +++ b/src/api/base/delivery.js @@ -0,0 +1,91 @@ +// 成品发货 +import request from '@/utils/request' +// 获得成品发货清单分页 +export function deliveryLogPage(data) { + return request({ + url: '/extend/delivery-log/page', + method: 'post', + data: data + }) +} + +// 获取发货进度分页 +export function deliveryProgressPage(data) { + return request({ + url: '/extend/delivery-progress/page', + method: 'post', + data: data + }) +} + +// 获取发货进度分页 +export function deliveryLogDetPage(data) { + return request({ + url: '/extend/delivery-log-det/page', + method: 'post', + data: data + }) +} + +// 创建成品发货清单 +export function deliveryLogCreate(data) { + return request({ + url: '/extend/delivery-log/create', + method: 'post', + data: data + }) +} + +// 更新成品发货清单 +export function deliveryLogUpdate(data) { + return request({ + url: '/extend/delivery-log/update', + method: 'put', + data: data + }) +} + +// 获得成品发货清单 +export function getDeliveryLog(query) { + return request({ + url: '/extend/delivery-log/get', + method: 'get', + params: query + }) +} + +// 删除成品发货清单 +export function deliveryLogDelete(query) { + return request({ + url: '/extend/delivery-log/delete', + method: 'delete', + params: query + }) +} + +// 装车 +export function deliveryLogDetCreate(data) { + return request({ + url: '/extend/delivery-log-det/create', + method: 'post', + data: data + }) +} + +// 获得一条发货详细 +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/orderManage.js b/src/api/base/orderManage.js index 9114d63c..38085d6a 100644 --- a/src/api/base/orderManage.js +++ b/src/api/base/orderManage.js @@ -94,3 +94,56 @@ export function orderIssue(data) { data: data }) } + +// 获得工单 +export function getWorkOrderById(query) { + return request({ + url: '/base/core-work-order/get', + method: 'get', + params: query + }) +} + +// 订单监控 +export function orderMonitor(query) { + return request({ + url: '/base/order/orderMonitor', + method: 'get', + params: query + }) +} + +// 获得所有客户列表 +export function customerList() { + return request({ + url: '/base/core-customer/listAll', + method: 'get' + }) +} + +// 获得订单详情 +export function orderDetail(query) { + return request({ + url: '/base/order/getDetail', + method: 'get', + params: query + }) +} + +// 产品bom消耗信息 +export function bomUseNum(query) { + return request({ + url: '/base/material-product-bom/bomUseNum', + method: 'get', + params: query + }) +} + +// 完成订单 +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/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/worker.js b/src/api/base/worker.js index 2fcee54c..67ad7268 100644 --- a/src/api/base/worker.js +++ b/src/api/base/worker.js @@ -14,4 +14,13 @@ export function getWorker(query) { 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/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..7cf3941c --- /dev/null +++ b/src/api/equipment/base/inspection/record.js @@ -0,0 +1,62 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-13 09:15:17 + * @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 + }) +} diff --git a/src/api/equipment/base/inspection/settings.js b/src/api/equipment/base/inspection/settings.js new file mode 100644 index 00000000..4e1fd898 --- /dev/null +++ b/src/api/equipment/base/inspection/settings.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-13 08:52:12 + * @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 + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/repair.js b/src/api/equipment/base/repair.js new file mode 100644 index 00000000..a93e4a9f --- /dev/null +++ b/src/api/equipment/base/repair.js @@ -0,0 +1,25 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-10 16:09:33 + * @LastEditTime: 2023-11-10 16:50:08 + * @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 + }) +} \ No newline at end of file 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..b2201cad --- /dev/null +++ b/src/api/equipment/base/spare-parts/config.js @@ -0,0 +1,51 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-11 16:18:57 + * @LastEditTime: 2023-11-11 17:28:54 + * @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 + }) +} \ 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..5be7bfb0 --- /dev/null +++ b/src/api/extend/processEquMaterialBom.js @@ -0,0 +1,106 @@ +/* + * @Author: zhp + * @Date: 2023-11-07 19:47:48 + * @LastEditTime: 2023-11-08 16:59:32 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得能耗统计查询分页 +export function processEquMaterialBomPage(data) { + return request({ + url: '/extend/process-equ-material-bom/page', + method: 'get', + data: 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 + }) +} diff --git a/src/api/extend/processEquValueBom.js b/src/api/extend/processEquValueBom.js new file mode 100644 index 00000000..8048c56b --- /dev/null +++ b/src/api/extend/processEquValueBom.js @@ -0,0 +1,106 @@ +/* + * @Author: zhp + * @Date: 2023-11-09 09:37:14 + * @LastEditTime: 2023-11-09 14:20:02 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得能耗统计查询分页 +export function processEquValueBomPage(data) { + return request({ + url: '/extend/process-equ-value-bom/page', + method: 'get', + data: 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 + }) +} 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..cdf92812 --- /dev/null +++ b/src/api/monitoring/statisticalData.js @@ -0,0 +1,40 @@ +/* + * @Author: zhp + * @Date: 2023-11-07 14:10:18 + * @LastEditTime: 2023-11-14 14:46:04 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得质量检查信息记录表分页 +export function getStatisticalDataPage(query) { + return request({ + url: '/base/statistical-data/getStatisticData', + method: 'get', + data: 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 index 5c257193..792d694b 100644 --- a/src/api/monitoring/teamProduction.js +++ b/src/api/monitoring/teamProduction.js @@ -16,4 +16,13 @@ export function getSchedulingMonitoringRecord(query) { 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..d2152584 --- /dev/null +++ b/src/api/quality/processTraceability.js @@ -0,0 +1,35 @@ +/* + * @Author: zhp + * @Date: 2023-10-31 15:05:06 + * @LastEditTime: 2023-11-03 09:05:50 + * @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 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/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/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/login.scss b/src/assets/styles/login.scss index 7efb2546..db9f3a47 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; @@ -34,231 +39,309 @@ $buttonHeight: $buttonH * 1px; // - - - - - 页面基础设置 .container { - .login-code { - width: 33%; - height: 38px; - float: right; - img { - cursor: pointer; - width:100%;max-width:100px; height:auto; - vertical-align: middle; - } - } - // 元素 - width: inherit; - height: inherit; - min-width: 1080px; - min-height: 620px; - background-color: $containerBgColor; - background-image: url($containerBgImage); - background-size: cover; - // 定位 - position: relative; - display: flex; - justify-content: center; - align-items: center; - // 文字 - font-size: 14px; - font-family: Microsoft YaHei; - font-weight: 400; - .logo { - // 元素 - width: $logoWidth; - height: $logoHeight; - // background-image: url($logoImage); - // background-size: contain; - // 定位 - position: absolute; - top: 50px; - left: 50%; - margin-left: -$logoWidth/2; - } - .content { - // 元素 - width: $contentWidth; - height: $contentHeight; - background-color: #ffffff; - box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07); - border-radius: 20px; - // 定位 - position: relative; - .pic { - // 元素 - width: $picWidth; - height: $picHeight; - background-image: url($picImage); - background-repeat: no-repeat; - background-size: cover; - border-radius: 20px 0 0 20px; - // 定位 - position: absolute; - top: 0; - left: 0; - } - .field { - width: $fieldWidth; - height: $fieldHeight; - // 定位 - position: absolute; - top: 0; - left: $picWidth; - display:flex; - justify-content: center; - align-items: center; - .pc-title{ width: 100%; clear: both;} - .mobile-title, - .mobile-switch { - display: none; - } - .form { - box-sizing: border-box; - width: $formWidth; - // - - - tab - :deep(.el-tabs__content) { - padding: 20px 0 0; - } - :deep(.el-tabs__item) { - // 元素 - width: $tabWidth; - height: $rowHeight; - padding: 0; - // 文字 - line-height: $rowHeight; - color: #666666; - } - :deep(.el-tabs__item.is-active) { - font-weight: bold; - color: #2F53EB; - } - :deep(.el-tabs__active-bar) { - height: 3px; - border-radius: 2px; - } - // - - - input - :deep(.el-input__inner) { - // 元素 - width: 100%; - height: $rowHeight; - background: #f5f5f5; - border: 0; - border-radius: 28px; - // 文字 - text-align: center; - line-height: 19px; - color: #262626; - } - .code:deep(.el-input__inner) { - padding: 0 24px; - // 文字 - text-align: left; - } - :deep(.el-input__inner::-webkit-input-placeholder) { /* WebKit browsers */ - font-weight: 400; - color: #8C8C8C; - } - :deep(.el-input__inner:-moz-placeholder) { /* Mozilla Firefox 4 to 18 */ - font-weight: 400; - color: #8C8C8C; - } - :deep(.el-input__inner::-moz-placeholder) { /* Mozilla Firefox 19+ */ - font-weight: 400; - color: #8C8C8C; - opacity:1; - } - :deep(.el-input__inner:-ms-input-placeholder) { /* Internet Explorer 10+ */ - font-weight: 400; - color: #8C8C8C !important; - } - :deep(.el-form-item) { - position: relative; - .button-code { - // 元素 - height: $rowHeight; - box-sizing: border-box; - // 定位 - position: absolute; - top: 0; - right: 20px; - z-index: 1; - // 文字 - line-height: 20px; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #2F53EB; - span { - padding-left: 15px; - border-left: 2px solid #D9D9D9; - } - } - } - :deep(.el-form-item__error) { - padding-left: 24px; - } - .button { - width: 100%; - height: $buttonHeight; - background: rgba(24, 144, 255, 0.2); - border: 0; - border-radius: 24px; - margin-bottom: 20px; - // 文字 - line-height: 26px; - font-size: 20px; - color: #FFFFFF; - } - .button-active { - background: #2F53EB; - box-shadow: 0px 2px 8px rgba(0, 80, 184, 0.2); - } - } - } - } - .footer { - // 元素 - height: 16px; - line-height: 16px; - font-size: 12px; - color: #8c8c8c; - // 定位 - position: absolute; - bottom: 30px; - a, - a:hover, - a:active { - color: inherit; - text-decoration: none; - } - } + .login-code { + width: 33%; + height: 38px; + float: right; + img { + cursor: pointer; + width: 100%; + max-width: 100px; + height: auto; + vertical-align: middle; + } + } + // 元素 + width: inherit; + height: inherit; + min-width: 1080px; + min-height: 620px; + background-color: $containerBgColor; + // background-image: url($containerBgImage); + background-size: cover; + // 定位 + position: relative; + display: flex; + justify-content: center; + align-items: center; + // 文字 + font-size: 14px; + font-family: Microsoft YaHei; + font-weight: 400; + .logo { + // 元素 + width: $logoWidth; + height: $logoHeight; + // background-image: url($logoImage); + // background-size: contain; + // 定位 + position: absolute; + top: 50px; + left: 50%; + margin-left: -$logoWidth/2; + } + .content { + // 元素 + // width: $contentWidth; + // height: $contentHeight; + width: 100%; + height: 100%; + background-color: #ffffff; + // box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07); + // border-radius: 20px; + // 定位 + position: relative; + display: flex; + + .pic { + // 元素 + width: $picWidth; + height: $picHeight; + background-image: url($picImage); + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: 0 0; + position: relative; + &::after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + // background: #f003; + display: inline-block; + } + } + .field { + // background: #ccc3; + position: relative; + padding-top: 196px; + flex: 1; + display: flex; + flex-direction: column; + // justify-content: center; + align-items: center; + .pc-title { + width: 100%; + text-align: center; + clear: both; + position: relative; + top: -36px; + + // h3.title { + // position: relative; + + // &::before { + // content: ''; + // background: url($cnbmLogo) 100% / 100% no-repeat; + // height: 48px; + // width: 48px; + // position: absolute; + // left: 0px; + // top: 4px; + // display: inline-block; + // } + // } + } + .mobile-title, + .mobile-switch { + display: none; + } + .form { + margin-top: 32px; + box-sizing: border-box; + // width: $formWidth; + width: 100%; + // - - - tab + :deep(.el-tabs__nav) { + // background: #f0f3; + } + :deep(.el-tabs__content) { + padding: 20px 0 0; + } + :deep(.el-tabs__item) { + user-select: none; + // 元素 + width: $tabWidth; + height: $rowHeight; + padding: 0; + // 文字 + line-height: $rowHeight; + color: #666666; + font-size: 18px; + font-weight: 400; + text-align: center; + } + :deep(.el-tabs__item.is-active) { + font-weight: 500; + color: #2f53eb; + } + :deep(.el-tabs__active-bar) { + height: 3px; + border-radius: 2px; + } + // - - - input + :deep(.el-input__inner) { + // 元素 + width: 100%; + height: $rowHeight; + background: #f5f5f5; + border: 0; + border-radius: 28px; + // 文字 + text-align: center; + line-height: 19px; + color: #262626; + } + .code:deep(.el-input__inner) { + padding: 0 24px; + // 文字 + text-align: left; + } + :deep(.el-input__inner::-webkit-input-placeholder) { + /* WebKit browsers */ + font-weight: 400; + color: #8c8c8c; + } + :deep(.el-input__inner:-moz-placeholder) { + /* Mozilla Firefox 4 to 18 */ + font-weight: 400; + color: #8c8c8c; + } + :deep(.el-input__inner::-moz-placeholder) { + /* Mozilla Firefox 19+ */ + font-weight: 400; + color: #8c8c8c; + opacity: 1; + } + :deep(.el-input__inner:-ms-input-placeholder) { + /* Internet Explorer 10+ */ + font-weight: 400; + color: #8c8c8c !important; + } + :deep(.el-form-item) { + position: relative; + .button-code { + // 元素 + height: $rowHeight; + box-sizing: border-box; + // 定位 + position: absolute; + top: 0; + right: 20px; + z-index: 1; + // 文字 + line-height: 20px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #2f53eb; + span { + padding-left: 15px; + border-left: 2px solid #d9d9d9; + } + } + } + :deep(.el-form-item__error) { + padding-left: 24px; + } + .button { + width: 100%; + height: $buttonHeight; + background: rgba(24, 144, 255, 0.2); + border: 0; + border-radius: 24px; + margin-bottom: 20px; + // 文字 + line-height: 26px; + font-size: 20px; + color: #ffffff; + } + .button-active { + background: #2f53eb; + box-shadow: 0px 2px 8px rgba(0, 80, 184, 0.2); + } + } + } + } + + .login-form { + * { + user-select: none; + } + // - - - input + :deep(.el-input__inner) { + // 元素 + width: 420px; + height: 66px; + color: #262626; + font-size: 18px; + } + :deep(.el-checkbox__label) { + font-size: 18px; + line-height: 14px; + } + } + + .footer { + user-select: none; + // 元素 + height: 16px; + line-height: 16px; + font-size: 12px; + color: #8c8c8c; + // 定位 + position: absolute; + bottom: 30px; + a, + a:hover, + a:active { + color: inherit; + text-decoration: none; + } + } } // - - - - - PC 最小尺寸设置 @media screen and (min-width: 599px) and (max-width: 1366px) { - .container { - .content { - width: 710px; - height: 397px; - .pic { - width: 314px; - } - .field { - width: calc(710px - 314px); - left: 314px; - .form { - width: 320px; - :deep(.el-input__inner) { - width: 320px; - height: 56px; - } - .button { - height: 50px; - } - } - } - } - } -} + .container { + min-width: 599px; + .content { + // width: 710px; + // height: 397px; + width: 100%; + height: 100%; + .pic { + // width: 314px; + display: none; + } + .field { + // width: calc(710px - 314px); + // left: 314px; + // justify-content: center; + width: 100%; + .pc-title { + h3 { + font-size: 2.4rem !important; + } + } + + .form { + // width: 320px; + :deep(.el-input__inner) { + width: 320px; + height: 56px; + } + .button { + height: 50px; + } + } + } + } + } +} /* ===== MOBILE DESIGN ===== */ $mobileW: 375; @@ -273,115 +356,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: 12px; + font-family: PingFang SC; + font-weight: 400; + line-height: 17px; + color: #333333; + opacity: 0.6; + // 定位 + // position: absolute; + bottom: -32px; + } + } } 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 75c11b41..4449dab1 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">
@@ -100,7 +110,7 @@ v-for="file in form[col.prop] || []" :file="file" :key="file.fileUrl" - @delete="handleDeleteFile(file)" /> + @delete="!disabled && handleDeleteFile(file)" />
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index d9c4f4db..347d77f8 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -15,7 +15,7 @@ ref="fileUpload" > - 选取文件 + 选取文件
请上传 @@ -66,6 +66,11 @@ export default { isShowTip: { type: Boolean, default: true + }, + // 是否禁用 + disabled: { + type: Boolean, + default: false } }, data() { @@ -179,6 +184,7 @@ export default { }, // 获取文件名称 getFileName(name) { + console.log('你好', name) if (name.lastIndexOf("/") > -1) { return name.slice(name.lastIndexOf("/") + 1); } else { 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..66460aff --- /dev/null +++ b/src/layout/components/NavbarRight.vue @@ -0,0 +1,111 @@ + + + \ 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/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index c131407b..61d46432 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -76,6 +76,9 @@ export default { info(payload) { return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload); }, + del(payload) { + return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload); + }, // 过滤后端传回的详情数据 diff --git a/src/router/index.js b/src/router/index.js index 555a4184..b7ea83f8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -71,16 +71,47 @@ export const constantRoutes = [ }, { path: '/', + 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, - // redirect: 'core/base/factory', - // children: [{ - // path: 'index', - // redirect: 'core/base/factory', - // component: (resolve) => require(['@/views/index'], resolve), - // name: '首页', - // meta: { title: '首页', icon: 'dashboard', affix: true } - // } - // ] + // 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..93916ac0 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -180,6 +180,7 @@ input, textarea{ // 抽屉head区域---start .el-drawer__header { padding-bottom: 20px; + padding-left: 30px; margin-bottom: 23px; font-size: 20px; font-weight: 500; diff --git a/src/utils/dict.js b/src/utils/dict.js index f90ec7c2..ecaafb16 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -99,7 +99,11 @@ export const DICT_TYPE = { ORDER_STATUS: 'order_status', ORDER_ORIGIN: 'order_Origin', ORDER_PRIORITY: 'order_priority', - PACK_SPEC: 'pack_spec' + PACK_SPEC: 'pack_spec', + + // ============== EQUIPMENT - 设备模块 ============= + MAINTAIN_TYPE: 'maintain_type', + FAULT_LEVEL: 'fault-level', } /** diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue new file mode 100644 index 00000000..5dfda096 --- /dev/null +++ b/src/views/OperationalOverview/AGVBoard.vue @@ -0,0 +1,976 @@ + + + + + + + + + + diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue new file mode 100644 index 00000000..1a83f074 --- /dev/null +++ b/src/views/OperationalOverview/coldBoard.vue @@ -0,0 +1,1131 @@ + + + + + + + + + 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..a499d999 --- /dev/null +++ b/src/views/OperationalOverview/processingBoard.vue @@ -0,0 +1,969 @@ + + + + + + + + + + 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..8dd236e5 --- /dev/null +++ b/src/views/base/coreCustomer/add-or-updata.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/base/coreCustomer/index.vue b/src/views/base/coreCustomer/index.vue new file mode 100644 index 00000000..20a89f74 --- /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..cbf4c943 --- /dev/null +++ b/src/views/base/coreDepartment/add-or-updata.vue @@ -0,0 +1,107 @@ + + + + diff --git a/src/views/base/coreDepartment/index.vue b/src/views/base/coreDepartment/index.vue new file mode 100644 index 00000000..97b6e59e --- /dev/null +++ b/src/views/base/coreDepartment/index.vue @@ -0,0 +1,168 @@ + + + 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..052af981 --- /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..922ff0c2 --- /dev/null +++ b/src/views/base/coreProduct/add-or-updata.vue @@ -0,0 +1,423 @@ + + + + + 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..97f1a642 --- /dev/null +++ b/src/views/base/coreProduct/index.vue @@ -0,0 +1,186 @@ + + + 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..6b59fdc2 --- /dev/null +++ b/src/views/base/coreProductionLine/add-or-updata.vue @@ -0,0 +1,114 @@ + + + + diff --git a/src/views/base/coreProductionLine/index.vue b/src/views/base/coreProductionLine/index.vue new file mode 100644 index 00000000..215cf41c --- /dev/null +++ b/src/views/base/coreProductionLine/index.vue @@ -0,0 +1,193 @@ + + + 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..f718363c --- /dev/null +++ b/src/views/base/coreSupplier/add-or-updata.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/base/coreSupplier/index.vue b/src/views/base/coreSupplier/index.vue new file mode 100644 index 00000000..3da6699f --- /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..cf52a675 --- /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..ce76ebc9 --- /dev/null +++ b/src/views/base/coreWorkOrder/addWorkOrder.vue @@ -0,0 +1,301 @@ + + \ No newline at end of file diff --git a/src/views/base/coreWorkOrder/attr-add.vue b/src/views/base/coreWorkOrder/attr-add.vue new file mode 100644 index 00000000..e12787e0 --- /dev/null +++ b/src/views/base/coreWorkOrder/attr-add.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/base/coreWorkOrder/detail.vue b/src/views/base/coreWorkOrder/detail.vue new file mode 100644 index 00000000..c21e6754 --- /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..75ae3d9d --- /dev/null +++ b/src/views/base/coreWorkOrder/index.vue @@ -0,0 +1,414 @@ + + + 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..78e959f4 --- /dev/null +++ b/src/views/base/coreWorker/add-or-updata.vue @@ -0,0 +1,339 @@ + + + + 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..271400e8 --- /dev/null +++ b/src/views/base/coreWorkshopSection/add-or-updata.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/base/coreWorkshopSection/index.vue b/src/views/base/coreWorkshopSection/index.vue new file mode 100644 index 00000000..493cf42e --- /dev/null +++ b/src/views/base/coreWorkshopSection/index.vue @@ -0,0 +1,172 @@ + + + diff --git a/src/views/base/custom/index.vue b/src/views/base/custom/index.vue index 873693a1..ab412ea9 100644 --- a/src/views/base/custom/index.vue +++ b/src/views/base/custom/index.vue @@ -134,7 +134,7 @@ import printPreview from './preview' import { MessageBox } from 'element-ui' import { hiprint } from 'vue-plugin-hiprint' import providers from './providers' -import printData from './print-data' +// import printData from './print-data' import $ from 'jquery' import SmallTitle from './SmallTitle.vue' let hiprintTemplate = null @@ -160,6 +160,7 @@ export default { // width: 220, // height: 80 }, + printData:{}, drawer: false, // 纸张类型 paperTypes: { @@ -355,13 +356,13 @@ export default { }, preView() { const { width } = this.curPaper - this.$refs.preView.show(hiprintTemplate, printData, width) + this.$refs.preView.show(hiprintTemplate, this.printData, width) }, print() { // if (window.hiwebSocket.opened) { const printerList = hiprintTemplate.getPrinterList() console.log(printerList) - hiprintTemplate.print2(printData, { printer: '', title: '预览打印' }) + hiprintTemplate.print2(this.printData, { printer: '', title: '预览打印' }) // return // } // this.$message.error('客户端未连接,无法直接打印') diff --git a/src/views/base/material/add-or-updata.vue b/src/views/base/material/add-or-updata.vue index 43874659..c4480fb3 100644 --- a/src/views/base/material/add-or-updata.vue +++ b/src/views/base/material/add-or-updata.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: DY - * @LastEditTime: 2023-10-27 15:11:02 + * @LastEditTime: 2023-11-06 19:44:24 * @Description: -->