diff --git a/.env.dev b/.env.dev index c347fa7b..9b0643f4 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-10-23 09:19:17 + # @LastEditTime: 2023-10-30 10:49:39 # @LastEditors: zhp # @Description: ### @@ -9,14 +9,18 @@ ENV = 'development' # 页面标题 -VUE_APP_TITLE = 产线监控系统 +VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 + +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# 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_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/package.json b/package.json index 08d55ea0..abeb01a6 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "url": "https://github.com/YunaiV/ruoyi-vue-pro" }, "dependencies": { + "@antv/x6": "^2.15.3", "@babel/parser": "7.18.4", "@riophae/vue-treeselect": "0.4.0", "axios": "0.27.2", @@ -70,6 +71,7 @@ "screenfull": "5.0.2", "sortablejs": "1.10.2", "throttle-debounce": "2.1.0", + "uuid": "^9.0.1", "video.js": "^8.5.2", "vue": "2.7.14", "vue-count-to": "1.0.13", diff --git a/src/api/base/customer.js b/src/api/base/customer.js new file mode 100644 index 00000000..3408429d --- /dev/null +++ b/src/api/base/customer.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +// 获得所有客户列表 +export function getCustomerList() { + return request({ + url: '/base/core-customer/listAll', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/api/base/equipment.js b/src/api/base/equipment.js index 8c1b4246..6fb31456 100644 --- a/src/api/base/equipment.js +++ b/src/api/base/equipment.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 创建设备 export function createEquipment(data) { return request({ - url: '/base/equipment/create', + url: '/base/core-equipment/create', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function createEquipment(data) { // 更新设备 export function updateEquipment(data) { return request({ - url: '/base/equipment/update', + url: '/base/core-equipment/update', method: 'put', data: data }) @@ -21,7 +21,7 @@ export function updateEquipment(data) { // 删除设备 export function deleteEquipment(id) { return request({ - url: '/base/equipment/delete?id=' + id, + url: '/base/core-equipment/delete?id=' + id, method: 'delete' }) } @@ -29,7 +29,7 @@ export function deleteEquipment(id) { // 获得设备 export function getEquipment(id) { return request({ - url: '/base/equipment/get?id=' + id, + url: '/base/core-equipment/get?id=' + id, method: 'get' }) } @@ -37,7 +37,7 @@ export function getEquipment(id) { // 获得设备分页 export function getEquipmentPage(query) { return request({ - url: '/base/equipment/page', + url: '/base/core-equipment/page', method: 'get', params: query }) @@ -46,7 +46,7 @@ export function getEquipmentPage(query) { // 导出设备 Excel export function exportEquipmentExcel(query) { return request({ - url: '/base/equipment/export-excel', + url: '/base/core-equipment/export-excel', method: 'get', params: query, responseType: 'blob' @@ -55,7 +55,7 @@ export function exportEquipmentExcel(query) { // 获得所有设备列表 export function getEquipmentAll() { return request({ - url: '/base/equipment/listAll', + url: '/base/core-equipment/listAll', method: 'get' }) } diff --git a/src/api/base/equipmentType.js b/src/api/base/equipmentType.js index 57e7746a..3783fbdb 100644 --- a/src/api/base/equipmentType.js +++ b/src/api/base/equipmentType.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 创建设备类型 export function createEquipmentType(data) { return request({ - url: '/base/equipment-type/create', + url: '/base/core-equipment-type/create', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function createEquipmentType(data) { // 更新设备类型 export function updateEquipmentType(data) { return request({ - url: '/base/equipment-type/update', + url: '/base/core-equipment-type/update', method: 'put', data: data }) @@ -21,7 +21,7 @@ export function updateEquipmentType(data) { // 删除设备类型 export function deleteEquipmentType(id) { return request({ - url: '/base/equipment-type/delete?id=' + id, + url: '/base/core-equipment-type/delete?id=' + id, method: 'delete' }) } @@ -29,7 +29,7 @@ export function deleteEquipmentType(id) { // 获得设备类型 export function getEquipmentType(id) { return request({ - url: '/base/equipment-type/get?id=' + id, + url: '/base/core-equipment-type/get?id=' + id, method: 'get' }) } @@ -37,7 +37,7 @@ export function getEquipmentType(id) { // 获得设备类型分页 export function getEquipmentTypePage(query) { return request({ - url: '/base/equipment-type/page', + url: '/base/core-equipment-type/page', method: 'get', params: query }) @@ -46,7 +46,7 @@ export function getEquipmentTypePage(query) { // 导出设备类型 Excel export function exportEquipmentTypeExcel(query) { return request({ - url: '/base/equipment-type/export-excel', + url: '/base/core-equipment-type/export-excel', method: 'get', params: query, responseType: 'blob' diff --git a/src/api/base/factory.js b/src/api/base/factory.js index 76829191..6597ec2d 100644 --- a/src/api/base/factory.js +++ b/src/api/base/factory.js @@ -2,7 +2,7 @@ import request from '@/utils/request' // 获得工厂产线工段设备树形结构 export function getTree() { return request({ - url: '/base/factory/getTree', + url: '/base/core-factory/getTree', method: 'get' }) } \ No newline at end of file diff --git a/src/api/base/groupTeam.js b/src/api/base/groupTeam.js index 04a3ca19..32d752aa 100644 --- a/src/api/base/groupTeam.js +++ b/src/api/base/groupTeam.js @@ -58,3 +58,49 @@ export function listEnabled() { method: 'get' }) } + +// 获得班组组员信息分页 +export function groupTeamPage(query) { + return request({ + url: '/base/group-team-det/page', + method: 'get', + params: query + }) +} + +// 获得班组组员信息 +export function groupTeamDet(query) { + return request({ + url: '/base/group-team-det/get', + method: 'get', + params: query + }) +} + + +// 创建班组组员信息 +export function teamDetCreate(data) { + return request({ + url: '/base/group-team-det/create', + method: 'post', + data: data + }) +} + +// 更新班组组员信息 +export function teamDetUpdate(data) { + return request({ + url: '/base/group-team-det/update', + method: 'put', + data: data + }) +} + +// 删除班组组员信息 +export function teamDetDelete(query) { + return request({ + url: '/base/group-team-det/delete', + method: 'delete', + params: query + }) +} diff --git a/src/api/base/groupTeamScheduling.js b/src/api/base/groupTeamScheduling.js index 95e38dd6..be88f707 100644 --- a/src/api/base/groupTeamScheduling.js +++ b/src/api/base/groupTeamScheduling.js @@ -25,4 +25,4 @@ export function autoSet(query) { method: 'get', params: query }) -} \ No newline at end of file +} diff --git a/src/api/base/material.js b/src/api/base/material.js new file mode 100644 index 00000000..26e495a0 --- /dev/null +++ b/src/api/base/material.js @@ -0,0 +1,121 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-24 11:22:28 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建物料 +export function createMaterial(data) { + return request({ + url: '/base/material/create', + method: 'post', + data: data + }) +} + +// 更新物料 +export function updateMaterial(data) { + return request({ + url: '/base/material/update', + method: 'put', + data: data + }) +} + +// 删除物料 +export function deleteMaterial(id) { + return request({ + url: '/base/material/delete?id=' + id, + method: 'delete' + }) +} + +// 获得物料 +export function getMaterial(id) { + return request({ + url: '/base/material/get?id=' + id, + method: 'get' + }) +} + +// 获得物料code +export function getCode() { + return request({ + url: '/base/material/getMaterialCode', + method: 'get' + }) +} + +// 获得物料分页 +export function getMaterialPage(query) { + return request({ + url: '/base/material/page', + method: 'get', + params: query + }) +} + +// 获得物料列表 +export function getMaterialList(query) { + return request({ + url: '/base/material/listbyfilter', + method: 'get', + params: query + }) +} + +// 获得供应商所有列表 +export function getSupplierList(query) { + return request({ + url: '/base/core-supplier/listAll', + method: 'get', + params: query + }) +} + +// 获得物料属性列表 +export function getMaterialAttrList(query) { + return request({ + url: '/base/material-attr/page', + method: 'get', + params: query + }) +} + +// 创建物料属性 +export function createMaterialAttr(data) { + return request({ + url: '/base/material-attr/create', + method: 'post', + data: data + }) +} + +// 更新物料属性 +export function updateMaterialAttr(data) { + return request({ + url: '/base/material-attr/update', + method: 'put', + data: data + }) +} + +// 删除物料属性 +export function deleteMaterialAttr(id) { + return request({ + url: '/base/material-attr/delete?id=' + id, + method: 'delete' + }) +} + +// 获得物料属性 +export function getMaterialAttr(query) { + return request({ + url: '/base/material-attr/get', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/materialDate.js b/src/api/base/materialDate.js new file mode 100644 index 00000000..9c2782cb --- /dev/null +++ b/src/api/base/materialDate.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-24 17:09:59 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建物料批次 +export function createMaterialDate(data) { + return request({ + url: '/base/material-date/create', + method: 'post', + data: data + }) +} + +// 更新物料批次 +export function updateMaterialDate(data) { + return request({ + url: '/base/material-date/update', + method: 'put', + data: data + }) +} + +// 删除物料批次 +export function deleteMaterialDate(id) { + return request({ + url: '/base/material-date/delete?id=' + id, + method: 'delete' + }) +} + +// 获得物料批次 +export function getMaterialDate(id) { + return request({ + url: '/base/material-date/getDetail?id=' + id, + method: 'get' + }) +} + +// 获得物料批次code +export function getCode() { + return request({ + url: '/base/material-date/getMaterialDateCode', + method: 'get' + }) +} + +// 获得物料批次分页 +export function getMaterDatePage(query) { + return request({ + url: '/base/material-date/page', + method: 'get', + params: query + }) +} + +// 获得物料批次列表 +export function getMaterDateList(query) { + return request({ + url: '/base/material-date/listbyfilter', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/materialProductBom.js b/src/api/base/materialProductBom.js new file mode 100644 index 00000000..2b0474aa --- /dev/null +++ b/src/api/base/materialProductBom.js @@ -0,0 +1,112 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-26 20:06:29 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建产品Bom +export function createMaterialPB(data) { + return request({ + url: '/base/material-product-bom/create', + method: 'post', + data: data + }) +} + +// 更新产品Bom +export function updateMaterialPB(data) { + return request({ + url: '/base/material-product-bom/update', + method: 'put', + data: data + }) +} + +// 删除产品Bom +export function deleteMaterialPB(id) { + return request({ + url: '/base/material-product-bom/delete?id=' + id, + method: 'delete' + }) +} + +// 获得产品Bom +export function getMaterialPB(id) { + return request({ + url: '/base/material-product-bom/get?id=' + id, + method: 'get' + }) +} + +// 获得产品Bomcode +export function getCode() { + return request({ + url: '/base/material-product-bom/getMaterialProductBomCode', + method: 'get' + }) +} + +// 获得产品Bom分页 +export function getMaterialPBPage(query) { + return request({ + url: '/base/material-product-bom/page', + method: 'get', + params: query + }) +} + +// 获得产品Bom列表 +export function getMaterialPBList(query) { + return request({ + url: '/base/material-product-bom/listbyfilter', + method: 'get', + params: query + }) +} + +// 获得产品列表 +export function getProList(query) { + return request({ + url: '/base/core-product/listAll', + method: 'get', + params: query + }) +} + +// 获得产品Bom详细分页 +export function getProBomList(query) { + return request({ + url: '/base/material-product-bom-det/page', + method: 'get', + params: query + }) +} + +// 创建产品Bom详细 +export function createMaterialPBDet(data) { + return request({ + url: '/base/material-product-bom-det/create', + method: 'post', + data: data + }) +} + +// 更新产品Bom详细 +export function updateMaterialPBDet(data) { + return request({ + url: '/base/material-product-bom-det/update', + method: 'put', + data: data + }) +} + +// 删除产品Bom详细 +export function deleteMaterialPBDet(id) { + return request({ + url: '/base/material-product-bom-det/delete?id=' + id, + method: 'delete' + }) +} diff --git a/src/api/base/materialUseLog.js b/src/api/base/materialUseLog.js new file mode 100644 index 00000000..3497c071 --- /dev/null +++ b/src/api/base/materialUseLog.js @@ -0,0 +1,69 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-26 09:32:21 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建物料使用记录 +export function createMaterialLog(data) { + return request({ + url: '/base/material-use-log/create', + method: 'post', + data: data + }) +} + +// 更新物料使用记录 +export function updateMaterialLog(data) { + return request({ + url: '/base/material-use-log/update', + method: 'put', + data: data + }) +} + +// 获得物料使用记录 +export function getMaterialLog(id) { + return request({ + url: '/base/material-use-log/getDetail?id=' + id, + method: 'get' + }) +} + +// 获得物料使用记录分页 +export function getMaterialLogPage(query) { + return request({ + url: '/base/material-use-log/page', + method: 'get', + params: query + }) +} + +// 获得所有设备列表 +export function getEqListAll(query) { + return request({ + url: '/base/core-equipment/listAll', + method: 'get', + params: query + }) +} + +// 获得所有员工列表 +export function getworkerAll(query) { + return request({ + url: '/base/core-worker/listAll', + method: 'get', + params: query + }) +} + +// 删除物料使用记录 +export function deleteMaterialLog(id) { + return request({ + url: '/base/material-use-log/delete?id=' + id, + method: 'delete' + }) +} diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js new file mode 100644 index 00000000..9114d63c --- /dev/null +++ b/src/api/base/orderManage.js @@ -0,0 +1,96 @@ +import request from '@/utils/request' +// 条件获得订单列表 +export function orderList(query) { + return request({ + url: '/base/order/listbyfilter', + method: 'get', + params: query + }) +} + +// 条件获得工单列表 +export function workOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query + }) +} + +// 获得订单分页 +export function getOrderPage(query) { + return request({ + url: '/base/order/page', + method: 'get', + params: query + }) +} + +// 获取订单code +export function getOrderCode() { + return request({ + url: '/base/order/getOrderCode', + method: 'get' + }) +} + +// 获取工单code +export function getWorkOrderCode() { + return request({ + url: '/base/order/getWorkOrderCode', + method: 'get' + }) +} + +// 获得订单 +export function getOrderById(query) { + return request({ + url: '/base/order/get', + method: 'get', + params: query + }) +} + +// 获得工艺流程列表 +export function getProcessFlowList() { + return request({ + url: '/extend/process-flow/listAll', + method: 'get' + }) +} + +// 创建订单 +export function orderCreate(data) { + return request({ + url: '/base/order/create', + method: 'post', + data: data + }) +} + +// 更新订单 +export function orderUpdate(data) { + return request({ + url: '/base/order/update', + method: 'put', + data: data + }) +} + +// 删除订单 +export function orderDelete(query) { + return request({ + url: '/base/order/delete', + method: 'delete', + params: query + }) +} + +// 下发订单，绑定的穿工单id，新建不传 +export function orderIssue(data) { + return request({ + url: '/base/order/issue', + method: 'post', + data: data + }) +} diff --git a/src/api/base/product.js b/src/api/base/product.js new file mode 100644 index 00000000..4956018b --- /dev/null +++ b/src/api/base/product.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +// 获得产品列表 +export function getProductAll() { + return request({ + url: '/base/core-product/listAll', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/api/base/productionLine.js b/src/api/base/productionLine.js index 7fade9c9..add39173 100644 --- a/src/api/base/productionLine.js +++ b/src/api/base/productionLine.js @@ -2,7 +2,7 @@ import request from '@/utils/request' // 获得所有工厂产线列表 export function getLineAll() { return request({ - url: '/base/production-line/listAll', + url: '/base/core-production-line/listAll', method: 'get' }) } \ No newline at end of file diff --git a/src/api/base/workOrder.js b/src/api/base/workOrder.js new file mode 100644 index 00000000..a7ae35f5 --- /dev/null +++ b/src/api/base/workOrder.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +// 获得工单列表 +export function workOrderList() { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/api/base/worker.js b/src/api/base/worker.js new file mode 100644 index 00000000..2fcee54c --- /dev/null +++ b/src/api/base/worker.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' +// 获得所有员工列表 +export function getWorkerList() { + return request({ + url: '/base/core-worker/listAll', + method: 'get' + }) +} + +// 获得员工 +export function getWorker(query) { + return request({ + url: '/base/core-worker/get', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/workshopSection.js b/src/api/base/workshopSection.js index bf5e65d5..9f3fe108 100644 --- a/src/api/base/workshopSection.js +++ b/src/api/base/workshopSection.js @@ -2,7 +2,7 @@ import request from '@/utils/request' // 获得所有产线工段列表 export function getWorkShopAll() { return request({ - url: '/base/workshop-section/listAll', + url: '/base/core-workshop-section/listAll', method: 'get' }) } \ No newline at end of file diff --git a/src/api/monitoring/groupTeamView.js b/src/api/monitoring/groupTeamView.js new file mode 100644 index 00000000..81cbcd00 --- /dev/null +++ b/src/api/monitoring/groupTeamView.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' +// 执行班组追溯 根据工单 +export function getByWorkOrder(query) { + return request({ + url: '/monitoring/schedulingmonitoring/getByWorkOrder', + method: 'get', + params: query + }) +} + +// 执行班组追溯详情 根据工单班组 +export function getByTeam(query) { + return request({ + url: '/monitoring/schedulingmonitoring/getByTeam', + method: 'get', + params: query + }) +} + +// 获取某次排班的生产情况详情 +export function getByScheduling(query) { + return request({ + url: '/monitoring/schedulingmonitoring/getByScheduling', + method: 'get', + params: query + }) +} diff --git a/src/api/monitoring/orderEnergy.js b/src/api/monitoring/orderEnergy.js new file mode 100644 index 00000000..4cb77e30 --- /dev/null +++ b/src/api/monitoring/orderEnergy.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' +// 获取工单信息 +export function getWorkOrderMsg(data) { + return request({ + url: '/monitoring/energy-work-order/getWorkOrderMsg', + method: 'post', + data: data + }) +} + +// 获取工单能源消耗数据 +export function getOrderEnergyData(data) { + return request({ + url: '/monitoring/energy-work-order/getData', + method: 'post', + data: data + }) +} + diff --git a/src/api/monitoring/teamProduction.js b/src/api/monitoring/teamProduction.js new file mode 100644 index 00000000..5c257193 --- /dev/null +++ b/src/api/monitoring/teamProduction.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 获得排班信息分页 建议size 150 +export function groupTeamSchedulingPage(query) { + return request({ + url: '/base/group-team-scheduling/page', + method: 'get', + params: query + }) +} + +// 获得不同产线每小时报废数据，用于班组检测 班组生产情况详情（动态结构） +export function getSchedulingMonitoringRecord(query) { + return request({ + url: '/base/quality-inspection-record/getSchedulingMonitoringRecord', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/assets/icons/svg/icon-upload.svg b/src/assets/icons/svg/icon-upload.svg new file mode 100644 index 00000000..7c679b07 --- /dev/null +++ b/src/assets/icons/svg/icon-upload.svg @@ -0,0 +1,14 @@ + + + 上传 + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/table_delete.svg b/src/assets/icons/svg/table_delete.svg new file mode 100644 index 00000000..518fd2c8 --- /dev/null +++ b/src/assets/icons/svg/table_delete.svg @@ -0,0 +1,15 @@ + + + + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index 72d7e166..75c11b41 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -47,12 +47,14 @@ type="datetime" :placeholder="`请选择${col.label}`" value-format="timestamp" + @change="$emit('update', form)" v-bind="col.bind"> + 上传文件
@@ -94,6 +99,7 @@ class="file" v-for="file in form[col.prop] || []" :file="file" + :key="file.fileUrl" @delete="handleDeleteFile(file)" />
@@ -105,6 +111,7 @@ diff --git a/src/views/core/base/equipmentType/index.vue b/src/views/base/coreEquipmentType/index.vue similarity index 84% rename from src/views/core/base/equipmentType/index.vue rename to src/views/base/coreEquipmentType/index.vue index c5358201..b5838000 100644 --- a/src/views/core/base/equipmentType/index.vue +++ b/src/views/base/coreEquipmentType/index.vue @@ -37,7 +37,12 @@ @close="cancel" @cancel="cancel" @confirm="submitForm"> - + @@ -65,13 +70,13 @@ export default { return { searchBarKeys: ['name'], tableBtn: [ - this.$auth.hasPermi('base:equipment-type:update') + this.$auth.hasPermi('base:core-equipment-type:update') ? { type: 'edit', btnName: '修改', } : undefined, - this.$auth.hasPermi('base:equipment-type:delete') + this.$auth.hasPermi('base:core-equipment-type:delete') ? { type: 'delete', btnName: '删除', @@ -107,7 +112,7 @@ export default { type: 'separate', }, { - type: this.$auth.hasPermi('base:equipment-type:create') + type: this.$auth.hasPermi('base:core-equipment-type:create') ? 'button' : '', btnName: '新增', @@ -139,7 +144,7 @@ export default { input: true, label: '设备类型编码', prop: 'code', - url: '/base/equipment-type/getCode', + url: '/base/core-equipment-type/getCode', }, ], [ @@ -147,7 +152,7 @@ export default { select: true, label: '父类', prop: 'parentId', - url: '/base/equipment-type/page?pageNo=1&pageSize=100', + url: '/base/core-equipment-type/page?pageNo=1&pageSize=100', }, {}, ], @@ -207,8 +212,6 @@ export default { name: undefined, parentId: undefined, remark: undefined, - fileNames: [], - fileUrls: [], }; this.resetForm('form'); }, @@ -234,25 +237,6 @@ export default { const id = row.id; getEquipmentType(id).then((response) => { this.form = response.data; - // this.form = { - // code: 'SBLX20230925184444000041', - // name: '测试131', - // remark: '测试可删除', - // id: '1706258479729336322', - // files: [ - // { fileName: '1.png', fileUrl: '', fileType: 2 }, - // { fileName: '1.asdfaslkjfkasdf.png', fileUrl: '', fileType: 2 }, - // { fileName: '2.txt', fileUrl: '', fileType: 2 }, - // { fileName: '1.rar', fileUrl: '', fileType: 2 }, - // { fileName: '1.kkk', fileUrl: '', fileType: 2 }, - // { fileName: 'test.file', fileUrl: '', fileType: 2 }, - // { fileName: '222', fileUrl: '', fileType: 2 }, - // { fileName: 'g', fileUrl: '', fileType: 2 }, - // ], - // createTime: 1695638697000, - // parentId: '1701869972319584257', - // }; - // debugger; this.open = true; this.title = '修改设备类型'; }); diff --git a/src/views/base/equipmentAttr/index.vue b/src/views/base/equipmentAttr/index.vue deleted file mode 100644 index 9696af92..00000000 --- a/src/views/base/equipmentAttr/index.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - diff --git a/src/views/base/equipmentBindSection/dialogForm.vue b/src/views/base/equipmentBindSection/dialogForm.vue index ce6ff70c..3ef2de3e 100644 --- a/src/views/base/equipmentBindSection/dialogForm.vue +++ b/src/views/base/equipmentBindSection/dialogForm.vue @@ -191,7 +191,7 @@ export default { // 获取设备列表 async getEquipmentList() { const response = await this.$axios( - '/base/equipment/page?pageNo=1&pageSize=100' + '/base/core-equipment/page?pageNo=1&pageSize=100' ); this.equipmentList = response.data.list.map((item) => ({ label: item.name, diff --git a/src/views/base/equipmentBindSection/index.vue b/src/views/base/equipmentBindSection/index.vue index f0c2238f..47afbdb2 100644 --- a/src/views/base/equipmentBindSection/index.vue +++ b/src/views/base/equipmentBindSection/index.vue @@ -192,7 +192,7 @@ export default { { select: true, label: '设备', - url: '/base/equipment/page?pageNo=1&pageSize=100', + url: '/base/core-equipment/page?pageNo=1&pageSize=100', prop: 'equipmentId', rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, diff --git a/src/views/base/equipmentFile/index.vue b/src/views/base/equipmentFile/index.vue deleted file mode 100644 index cb2ebd21..00000000 --- a/src/views/base/equipmentFile/index.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - diff --git a/src/views/base/equipmentPlcConnect/index.vue b/src/views/base/equipmentPlcConnect/index.vue index f64f05cc..bb7c2df3 100644 --- a/src/views/base/equipmentPlcConnect/index.vue +++ b/src/views/base/equipmentPlcConnect/index.vue @@ -247,7 +247,7 @@ export default { select: true, label: '设备', prop: 'equipmentId', - url: '/base/equipment/page?pageNo=1&pageSize=99', + url: '/base/core-equipment/page?pageNo=1&pageSize=99', rules: [{ required: true, message: '不能为空', trigger: 'blur' }], bind: { filterable: true, @@ -283,7 +283,7 @@ export default { input: true, label: '关联表名', prop: 'plcTableName', - // url: '/base/equipment/getCode', + // url: '/base/core-equipment/getCode', }, ], ], @@ -320,7 +320,7 @@ export default { methods: { async getEquipmentOptions() { const res = await this.$axios({ - url: '/base/equipment/listAll', + url: '/base/core-equipment/listAll', method: 'get', }); return res.data; diff --git a/src/views/base/equipmentQuantityLog/index.vue b/src/views/base/equipmentQuantityLog/index.vue deleted file mode 100644 index b8d5208e..00000000 --- a/src/views/base/equipmentQuantityLog/index.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - diff --git a/src/views/base/equipmentQuantityRealtime/index.vue b/src/views/base/equipmentQuantityRealtime/index.vue deleted file mode 100644 index 6d85dbbe..00000000 --- a/src/views/base/equipmentQuantityRealtime/index.vue +++ /dev/null @@ -1,276 +0,0 @@ - - - diff --git a/src/views/base/equipmentStatusLog/index.vue b/src/views/base/equipmentStatusLog/index.vue deleted file mode 100644 index 5aa1b79a..00000000 --- a/src/views/base/equipmentStatusLog/index.vue +++ /dev/null @@ -1,289 +0,0 @@ - - - diff --git a/src/views/base/equipmentStatusRealtime/index.vue b/src/views/base/equipmentStatusRealtime/index.vue deleted file mode 100644 index 64b6e43f..00000000 --- a/src/views/base/equipmentStatusRealtime/index.vue +++ /dev/null @@ -1,296 +0,0 @@ - - - diff --git a/src/views/base/equipmentTypeFile/index.vue b/src/views/base/equipmentTypeFile/index.vue deleted file mode 100644 index e148348e..00000000 --- a/src/views/base/equipmentTypeFile/index.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - diff --git a/src/views/base/material/SmallTitle.vue b/src/views/base/material/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/material/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/material/add-or-updata.vue b/src/views/base/material/add-or-updata.vue new file mode 100644 index 00000000..43874659 --- /dev/null +++ b/src/views/base/material/add-or-updata.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/views/base/material/attr-add.vue b/src/views/base/material/attr-add.vue new file mode 100644 index 00000000..2106320e --- /dev/null +++ b/src/views/base/material/attr-add.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/base/material/index.vue b/src/views/base/material/index.vue new file mode 100644 index 00000000..08ecf314 --- /dev/null +++ b/src/views/base/material/index.vue @@ -0,0 +1,233 @@ + + + diff --git a/src/views/base/materialDate/add-or-updata.vue b/src/views/base/materialDate/add-or-updata.vue new file mode 100644 index 00000000..110a01f1 --- /dev/null +++ b/src/views/base/materialDate/add-or-updata.vue @@ -0,0 +1,107 @@ + + + + diff --git a/src/views/base/materialDate/index.vue b/src/views/base/materialDate/index.vue new file mode 100644 index 00000000..7ea838ea --- /dev/null +++ b/src/views/base/materialDate/index.vue @@ -0,0 +1,169 @@ + + + diff --git a/src/views/base/materialProductBom/add-or-updata.vue b/src/views/base/materialProductBom/add-or-updata.vue new file mode 100644 index 00000000..a30323a8 --- /dev/null +++ b/src/views/base/materialProductBom/add-or-updata.vue @@ -0,0 +1,469 @@ + + + + + diff --git a/src/views/base/materialProductBom/index.vue b/src/views/base/materialProductBom/index.vue new file mode 100644 index 00000000..5e4b5331 --- /dev/null +++ b/src/views/base/materialProductBom/index.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/base/materialUseLog/add-or-updata.vue b/src/views/base/materialUseLog/add-or-updata.vue new file mode 100644 index 00000000..7d7ff568 --- /dev/null +++ b/src/views/base/materialUseLog/add-or-updata.vue @@ -0,0 +1,258 @@ + + + + diff --git a/src/views/base/materialUseLog/index.vue b/src/views/base/materialUseLog/index.vue new file mode 100644 index 00000000..4a1f4b79 --- /dev/null +++ b/src/views/base/materialUseLog/index.vue @@ -0,0 +1,212 @@ + + + diff --git a/src/views/core/base/equipment/assets/eq1.jpg b/src/views/core/base/equipment/assets/eq1.jpg deleted file mode 100644 index e62db64c..00000000 Binary files a/src/views/core/base/equipment/assets/eq1.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq10.jpg b/src/views/core/base/equipment/assets/eq10.jpg deleted file mode 100644 index 1f738260..00000000 Binary files a/src/views/core/base/equipment/assets/eq10.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq2.jpg b/src/views/core/base/equipment/assets/eq2.jpg deleted file mode 100644 index 7ca5dcc1..00000000 Binary files a/src/views/core/base/equipment/assets/eq2.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq3.jpg b/src/views/core/base/equipment/assets/eq3.jpg deleted file mode 100644 index 45f23067..00000000 Binary files a/src/views/core/base/equipment/assets/eq3.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq4.jpg b/src/views/core/base/equipment/assets/eq4.jpg deleted file mode 100644 index 51476968..00000000 Binary files a/src/views/core/base/equipment/assets/eq4.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq5.jpg b/src/views/core/base/equipment/assets/eq5.jpg deleted file mode 100644 index 8e536163..00000000 Binary files a/src/views/core/base/equipment/assets/eq5.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq6.jpg b/src/views/core/base/equipment/assets/eq6.jpg deleted file mode 100644 index 256ec18e..00000000 Binary files a/src/views/core/base/equipment/assets/eq6.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq7.jpg b/src/views/core/base/equipment/assets/eq7.jpg deleted file mode 100644 index 3fae2905..00000000 Binary files a/src/views/core/base/equipment/assets/eq7.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq8.jpg b/src/views/core/base/equipment/assets/eq8.jpg deleted file mode 100644 index ff3c2c39..00000000 Binary files a/src/views/core/base/equipment/assets/eq8.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/assets/eq9.jpg b/src/views/core/base/equipment/assets/eq9.jpg deleted file mode 100644 index 93754f39..00000000 Binary files a/src/views/core/base/equipment/assets/eq9.jpg and /dev/null differ diff --git a/src/views/core/base/equipment/components/EquipmentAssets.vue b/src/views/core/base/equipment/components/EquipmentAssets.vue deleted file mode 100644 index aa7b92b8..00000000 --- a/src/views/core/base/equipment/components/EquipmentAssets.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - diff --git a/src/views/core/base/equipment/components/EquipmentPics.vue b/src/views/core/base/equipment/components/EquipmentPics.vue deleted file mode 100644 index 9c4b1f92..00000000 --- a/src/views/core/base/equipment/components/EquipmentPics.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue index d94c6478..412e649d 100644 --- a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue +++ b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue @@ -20,9 +20,6 @@ @change="selectObj" clearable> - - - \ No newline at end of file diff --git a/src/views/energy/monitoring/orderEnergy/index.vue b/src/views/energy/monitoring/orderEnergy/index.vue new file mode 100644 index 00000000..847d7003 --- /dev/null +++ b/src/views/energy/monitoring/orderEnergy/index.vue @@ -0,0 +1,271 @@ + + + \ No newline at end of file diff --git a/src/views/base/equipmentGroup/components/BasicDrawer.vue b/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue similarity index 100% rename from src/views/base/equipmentGroup/components/BasicDrawer.vue rename to src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue diff --git a/src/views/base/equipmentGroup/components/dialogForm.vue b/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue similarity index 98% rename from src/views/base/equipmentGroup/components/dialogForm.vue rename to src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue index 519b435e..ec7a67a0 100644 --- a/src/views/base/equipmentGroup/components/dialogForm.vue +++ b/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue @@ -21,7 +21,7 @@ :disabled="disabled" v-model="dataForm.code" @change="$emit('update', dataForm)" - placeholder="请输入工段排序" /> + placeholder="请输入报警编码" /> + + + + + + diff --git a/src/views/equipment/base/config/DataCollection/TableConfig.vue b/src/views/equipment/base/config/DataCollection/TableConfig.vue new file mode 100644 index 00000000..9eb98fd3 --- /dev/null +++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/src/views/equipment/base/config/deprecated/dialogForm.vue b/src/views/equipment/base/config/deprecated/dialogForm.vue new file mode 100644 index 00000000..329186da --- /dev/null +++ b/src/views/equipment/base/config/deprecated/dialogForm.vue @@ -0,0 +1,187 @@ + + + + + + + diff --git a/src/views/equipment/base/config/deprecated/index.vue b/src/views/equipment/base/config/deprecated/index.vue new file mode 100644 index 00000000..dda58f82 --- /dev/null +++ b/src/views/equipment/base/config/deprecated/index.vue @@ -0,0 +1,361 @@ + + + diff --git a/src/views/equipment/timing-diagram/output/index.vue b/src/views/equipment/timing-diagram/output/index.vue index d1a495ae..ccf74e5f 100644 --- a/src/views/equipment/timing-diagram/output/index.vue +++ b/src/views/equipment/timing-diagram/output/index.vue @@ -416,7 +416,7 @@ export default { /** 准备设备数据 */ async initEquipment() { const { code, data } = await this.$axios({ - url: '/base/equipment/listAll', + url: '/base/core-equipment/listAll', method: 'get', }); if (code == 0) { diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue index ac6ddaf1..283e07f4 100644 --- a/src/views/equipment/timing-diagram/status/index.vue +++ b/src/views/equipment/timing-diagram/status/index.vue @@ -223,7 +223,7 @@ export default { /** 准备设备数据 */ async initEquipment() { const { code, data } = await this.$axios({ - url: '/base/equipment/listAll', + url: '/base/core-equipment/listAll', method: 'get', }); if (code == 0) { diff --git a/src/views/extend/processFlow/index.vue b/src/views/extend/processFlow/index.vue new file mode 100644 index 00000000..655bc680 --- /dev/null +++ b/src/views/extend/processFlow/index.vue @@ -0,0 +1,367 @@ + + + + + + + diff --git a/src/views/extend/processFlowView/components/ProcessBomList.vue b/src/views/extend/processFlowView/components/ProcessBomList.vue new file mode 100644 index 00000000..f0953184 --- /dev/null +++ b/src/views/extend/processFlowView/components/ProcessBomList.vue @@ -0,0 +1,138 @@ + + + + + + + diff --git a/src/views/extend/processFlowView/components/ProcessDetail.vue b/src/views/extend/processFlowView/components/ProcessDetail.vue new file mode 100644 index 00000000..5cb65004 --- /dev/null +++ b/src/views/extend/processFlowView/components/ProcessDetail.vue @@ -0,0 +1,482 @@ + + + + + + + + + diff --git a/src/views/extend/processFlowView/components/ProcessInfo.vue b/src/views/extend/processFlowView/components/ProcessInfo.vue new file mode 100644 index 00000000..705fefba --- /dev/null +++ b/src/views/extend/processFlowView/components/ProcessInfo.vue @@ -0,0 +1,133 @@ + + + + + + + diff --git a/src/views/extend/processFlowView/components/ProcessNode.js b/src/views/extend/processFlowView/components/ProcessNode.js new file mode 100644 index 00000000..948aaf24 --- /dev/null +++ b/src/views/extend/processFlowView/components/ProcessNode.js @@ -0,0 +1,170 @@ +import { Node, ObjectExt, Shape } from '@antv/x6'; +import { IdToName } from '@/utils' +import cache from '@/utils/cache' +import axios from '@/utils/request' +import { v4 } from 'uuid' + +Shape.Edge.config({ + attrs: { + line: { + stroke: '#ccc', + strokeWidth: 1, + targetMarker: { + name: 'block', + width: 1, + height: 1 + }, + }, + } +}) + + +export default class ProcessNode extends Node { } +ProcessNode.config({ + width: 200, + height: 100, + markup: [ + { + tagName: 'rect', + selector: 'container', + attrs: { + x: 0, + y: 0, + width: 200, + height: 100, + fill: 'transparent', + stroke: '#ccc' + }, + }, + { + tagName: 'rect', + attrs: { + x: 0, + y: 0, + width: 200, + height: 50, + fill: '#ffffff', + }, + }, + { + tagName: 'rect', + attrs: { + x: 0, + y: 50, + width: 200, + height: 50, + fill: '#f8f8f8', + }, + }, + { + tagName: 'text', + selector: 'detName', + attrs: { + x: 20, + y: 30, + }, + }, + { + tagName: 'text', + selector: 'sectionName', + attrs: { + x: 115, + y: 30, + }, + }, + { + tagName: 'text', + selector: 'detDesc', + attrs: { + x: 26, + y: 80, + fill: '#777', + fontSize: 14, + fill: '#1a90fc', + }, + }, + ], + attrs: { + line: { + fill: 'red' + } + }, + ports: { + groups: { + in: { + position: 'left', + attrs: { + circle: { + r: 2, + magnet: true, + stroke: '#0b58ff', + strokeWidth: 1, + fill: '#0b58ff' + } + } + }, + out: { + position: 'right', + attrs: { + circle: { + r: 2, + magnet: true, + stroke: '#0b58ff', + strokeWidth: 1, + fill: '#0b58ff' + } + } + } + } + }, + propHooks(metadata) { + const { detId, detName, detDesc, sectionName, processId, sectionId, ...others } = metadata; + // debugger; + if (detName) ObjectExt.setByPath(others, 'attrs/detName/text', detName); + if (detDesc) ObjectExt.setByPath(others, 'attrs/detDesc/text', detDesc); + if (sectionName) ObjectExt.setByPath(others, 'attrs/sectionName/text', sectionName); + if (detId) ObjectExt.setByPath(others, 'attrs/detId/text', detId); + if (processId) ObjectExt.setByPath(others, 'attrs/processId/text', processId); + if (sectionId) ObjectExt.setByPath(others, 'attrs/sectionId/text', sectionId); + return others; + } +}); + +export const CACHE_NAME = 'ProcessDetail::section'; + +export async function getSectionFrom(sectionId) { + const sectionList = await cache.getList( + CACHE_NAME, + async () => { + const { code, data } = await axios( + '/base/core-production-line/listAll' + ); + if (code == 0) { + return data; + } + } + ); + return IdToName(sectionId, sectionList); +} + +export async function createProcessNode({ flowId, id, name, sectionId, remark }) { + const sectionName = await getSectionFrom(sectionId); + return { + shape: 'process-node', + x: 0, + y: 0, + detName: name, // 工序名称 + sectionName, // 工段 + sectionId, + detDesc: remark, // 工序说明 + processId: flowId, // 工艺ID + detId: id, // 工序ID + tools: [], + ports: [ + { id: v4(), group: 'in' }, + { id: v4(), group: 'out' }, + ] + }; +} + +export async function createEdge(src, dest) { } \ No newline at end of file diff --git a/src/views/extend/processFlowView/index.vue b/src/views/extend/processFlowView/index.vue new file mode 100644 index 00000000..88b09919 --- /dev/null +++ b/src/views/extend/processFlowView/index.vue @@ -0,0 +1,63 @@ + + + + + + + diff --git a/src/views/group/base/groupClasses/index.vue b/src/views/group/base/groupClasses/index.vue index 09a52985..a38f97c7 100644 --- a/src/views/group/base/groupClasses/index.vue +++ b/src/views/group/base/groupClasses/index.vue @@ -108,20 +108,22 @@ export default { ], tableProps, tableBtn: [ - { - type: 'cancel', - btnName: '作废', - showParam: { - type: '&', - data: [ - { - type: 'unequal', - name: 'status', - value: '不可用' - } - ] + this.$auth.hasPermi('base:group-classes:cancel') + ? { + type: 'cancel', + btnName: '作废', + showParam: { + type: '&', + data: [ + { + type: 'unequal', + name: 'status', + value: '不可用' + } + ] + } } - }, + : undefined, this.$auth.hasPermi('base:group-classes:update') ? { type: 'edit', diff --git a/src/views/group/base/groupTeam/components/groupTeamAdd.vue b/src/views/group/base/groupTeam/components/groupTeamAdd.vue index aaffb276..249facd2 100644 --- a/src/views/group/base/groupTeam/components/groupTeamAdd.vue +++ b/src/views/group/base/groupTeam/components/groupTeamAdd.vue @@ -1,5 +1,5 @@ + \ No newline at end of file diff --git a/src/views/group/base/groupTeam/components/workerOperate.vue b/src/views/group/base/groupTeam/components/workerOperate.vue new file mode 100644 index 00000000..956bf89f --- /dev/null +++ b/src/views/group/base/groupTeam/components/workerOperate.vue @@ -0,0 +1,41 @@ + + + \ No newline at end of file diff --git a/src/views/group/base/groupTeam/components/workerTeamAdd.vue b/src/views/group/base/groupTeam/components/workerTeamAdd.vue new file mode 100644 index 00000000..6f233917 --- /dev/null +++ b/src/views/group/base/groupTeam/components/workerTeamAdd.vue @@ -0,0 +1,113 @@ + + \ No newline at end of file diff --git a/src/views/group/base/groupTeam/index.vue b/src/views/group/base/groupTeam/index.vue index 0f761324..14d3ce47 100644 --- a/src/views/group/base/groupTeam/index.vue +++ b/src/views/group/base/groupTeam/index.vue @@ -41,14 +41,18 @@ > + + + \ No newline at end of file diff --git a/src/views/group/monitoring/groupTeamView/index.vue b/src/views/group/monitoring/groupTeamView/index.vue new file mode 100644 index 00000000..7a5a6e1f --- /dev/null +++ b/src/views/group/monitoring/groupTeamView/index.vue @@ -0,0 +1,141 @@ + + \ No newline at end of file diff --git a/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue b/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue new file mode 100644 index 00000000..a681e8c0 --- /dev/null +++ b/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue @@ -0,0 +1,162 @@ + + + \ No newline at end of file diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue new file mode 100644 index 00000000..c5fce23c --- /dev/null +++ b/src/views/group/monitoring/teamProduction/index.vue @@ -0,0 +1,157 @@ + + \ No newline at end of file diff --git a/src/views/monitoring/equipmentStatusAndParams/index.vue b/src/views/monitoring/equipmentStatusAndParams/index.vue index 2c604d31..7c466aee 100644 --- a/src/views/monitoring/equipmentStatusAndParams/index.vue +++ b/src/views/monitoring/equipmentStatusAndParams/index.vue @@ -117,6 +117,7 @@ export default { { _action: 'params-monitor', label: '操作', + width: 56, subcomponent: { props: ['injectData'], render: function (h) { @@ -124,10 +125,10 @@ export default { return h( 'el-button', { + class: 'iconfont icon-detail', props: { type: 'text' }, on: { click: function () { - console.log('inejctdata', _this.injectData); _this.$emit('emitData', { action: _this.injectData._action, // value: _this.injectData.id, @@ -135,8 +136,8 @@ export default { }); }, }, - }, - '查看详情' + } + // '查看详情' ); }, }, @@ -215,7 +216,7 @@ export default { /** 根据产线获取设备 */ async getEquipmentList(id) { const { data } = await this.$axios({ - url: '/base/equipment/listByLine', + url: '/base/core-equipment/listByLine', method: 'get', params: { id }, }); diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue new file mode 100644 index 00000000..d8401e41 --- /dev/null +++ b/src/views/order/base/orderManage/components/addWorkOrder.vue @@ -0,0 +1,289 @@ + + \ No newline at end of file diff --git a/src/views/order/base/orderManage/components/bindWorkOrder.vue b/src/views/order/base/orderManage/components/bindWorkOrder.vue new file mode 100644 index 00000000..48d07d70 --- /dev/null +++ b/src/views/order/base/orderManage/components/bindWorkOrder.vue @@ -0,0 +1,11 @@ + + \ No newline at end of file diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue new file mode 100644 index 00000000..4a5317b5 --- /dev/null +++ b/src/views/order/base/orderManage/components/orderAdd.vue @@ -0,0 +1,299 @@ + + \ No newline at end of file diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue new file mode 100644 index 00000000..825be503 --- /dev/null +++ b/src/views/order/base/orderManage/index.vue @@ -0,0 +1,353 @@ + + \ No newline at end of file diff --git a/src/views/quality/monitoring/qualityStatistics/graphPage.vue b/src/views/quality/monitoring/qualityStatistics/graphPage.vue index 87bc01fc..b1056e82 100644 --- a/src/views/quality/monitoring/qualityStatistics/graphPage.vue +++ b/src/views/quality/monitoring/qualityStatistics/graphPage.vue @@ -64,6 +64,7 @@ export default { name: item.inspectionContent, type: 'bar', barCategoryGap: 12, + barWidth: 20, data: [], }; diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index a8be162d..81ca0e82 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -80,7 +80,7 @@ - + diff --git a/vue.config.js b/vue.config.js index 89fa889a..16ce2e35 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,7 +36,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy ['/proxy-api']: { - target: `http://localhost:48080`, + target: `http://localhost:80`, // target: `http://api-dashboard.yudao.iocoder.cn`, changeOrigin: true, pathRewrite: { diff --git a/yarn.lock b/yarn.lock index 0fc14b5d..6b8dfcb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,6 +19,28 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" +"@antv/x6-common@^2.0.15": + "integrity" "sha512-9ghYsxbT7WjQ0thqjcQwnjuBdL8DSTptEubf0DvBZOJ0wmapclXqYPOM+XYPNtC1dcKDqqxsw5mdcbcAmQ224Q==" + "resolved" "https://registry.npmmirror.com/@antv/x6-common/-/x6-common-2.0.15.tgz" + "version" "2.0.15" + dependencies: + "lodash-es" "^4.17.15" + "utility-types" "^3.10.0" + +"@antv/x6-geometry@^2.0.5": + "integrity" "sha512-MId6riEQkxphBpVeTcL4ZNXL4lScyvDEPLyIafvWMcWNTGK0jgkK7N20XSzqt8ltJb0mGUso5s56mrk8ysHu2A==" + "resolved" "https://registry.npmmirror.com/@antv/x6-geometry/-/x6-geometry-2.0.5.tgz" + "version" "2.0.5" + +"@antv/x6@^2.15.3": + "integrity" "sha512-mI8Aqc/0+/ZlXguibnKovGkKy3w7UFg+CMwAq5oYdBrMEgwgvQ/Rw9tK2LOTgKAINv+5QQ9zJTY058Kv1UfeRA==" + "resolved" "https://registry.npmmirror.com/@antv/x6/-/x6-2.15.3.tgz" + "version" "2.15.3" + dependencies: + "@antv/x6-common" "^2.0.15" + "@antv/x6-geometry" "^2.0.5" + "utility-types" "^3.10.0" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.5": "integrity" "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==" "resolved" "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.5.tgz" @@ -6956,6 +6978,11 @@ dependencies: "p-locate" "^4.1.0" +"lodash-es@^4.17.15": + "integrity" "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + "resolved" "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz" + "version" "4.17.21" + "lodash.debounce@^4.0.8": "integrity" "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" "resolved" "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz" @@ -11041,6 +11068,11 @@ "resolved" "https://registry.npmmirror.com/utila/-/utila-0.4.0.tgz" "version" "0.4.0" +"utility-types@^3.10.0": + "integrity" "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==" + "resolved" "https://registry.npmmirror.com/utility-types/-/utility-types-3.10.0.tgz" + "version" "3.10.0" + "utils-merge@1.0.1": "integrity" "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" "resolved" "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz" @@ -11063,6 +11095,11 @@ "resolved" "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz" "version" "8.3.2" +"uuid@^9.0.1": + "integrity" "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==" + "resolved" "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz" + "version" "9.0.1" + "v8-compile-cache@^2.0.3": "integrity" "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" "resolved" "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz" @@ -11322,7 +11359,7 @@ dependencies: "deepmerge" "^4.2.2" -"vue-plugin-hiprint@^0.0.54-fix": +"vue-plugin-hiprint@0.0.54-fix": "integrity" "sha512-WVUQdTIsxixS1VFr5nNIa0Hztrb9szJgS3z4MPUvu9gdqdu32lU3Jhux8QBTeVYrjIfNGuiNKNn5WUb+A5RK5Q==" "resolved" "https://registry.npmmirror.com/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.54-fix.tgz" "version" "0.0.54-fix"