diff --git a/package.json b/package.json index 353dbbff..39ec700f 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", + "swiper": "^5.4.5", "v-scale-screen": "^1.0.2", "vue": "2.6.12", "vue-count-to": "1.0.13", diff --git a/src/api/kanban/dryingprocess.js b/src/api/kanban/dryingprocess.js new file mode 100644 index 00000000..23c0fdb4 --- /dev/null +++ b/src/api/kanban/dryingprocess.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// /**烘房生产监控看板--当天烘房情况**/ +export function getHEProInfo(data) { + return request({ + url: '/mes/mesborad/getHFProInfo', + method: 'post', + data: data + }); +} +///**烘房生产监控看板--当天质量情况**/ +export function getHFQcInfo(data) { + return request({ + url: '/mes/mesborad/getHFQcInfo', + method: 'post', + data: data + }); +} +// /**烘房生产监控看板--效率分析**/ +export function getHFxlInfo(data) { + return request({ + url: '/mes/mesborad/getHFxlInfo', + method: 'post', + data: data + }); +} diff --git a/src/api/system/noticeGroup.js b/src/api/system/noticeGroup.js new file mode 100644 index 00000000..fd900c7e --- /dev/null +++ b/src/api/system/noticeGroup.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 查询通知公告-班组列表 +export function listNoticeGroup(query) { + return request({ + url: '/system/noticeGroup/list', + method: 'get', + params: query + }); +} + +// 查询通知公告-班组详细 +export function getNoticeGroup(id) { + return request({ + url: '/system/noticeGroup/' + id, + method: 'get' + }); +} + +// 新增通知公告-班组 +export function addNoticeGroup(data) { + return request({ + url: '/system/noticeGroup', + method: 'post', + data: data + }); +} + +// 修改通知公告-班组 +export function updateNoticeGroup(data) { + return request({ + url: '/system/noticeGroup', + method: 'put', + data: data + }); +} + +// 删除通知公告-班组 +export function delNoticeGroup(data) { + return request({ + url: '/system/noticeGroup/delNoticeGroup', + method: 'post', + data: data + }); +} + +export function teamBind(data) { + return request({ + url: '/system/noticeGroup/teamBind', + method: 'post', + data: data + }); +} + diff --git a/src/api/wms/product.js b/src/api/wms/product.js index 9a8a974d..fb3c99bd 100644 --- a/src/api/wms/product.js +++ b/src/api/wms/product.js @@ -55,3 +55,21 @@ export function delProduct(productId) { method: 'delete' }); } + +// 修改物料附属信息 +export function updateProductAttached(data) { + return request({ + url: '/wms/attached', + method: 'put', + data: data + }); +} + +// 新增物料附属信息 +export function addProductAttached(data) { + return request({ + url: '/wms/attached', + method: 'post', + data: data + }); +} diff --git a/src/assets/images/bg4.png b/src/assets/images/bg4.png new file mode 100644 index 00000000..c881d2d3 Binary files /dev/null and b/src/assets/images/bg4.png differ diff --git a/src/assets/images/bg5.png b/src/assets/images/bg5.png new file mode 100644 index 00000000..d9f35a2f Binary files /dev/null and b/src/assets/images/bg5.png differ diff --git a/src/assets/images/bg6.png b/src/assets/images/bg6.png new file mode 100644 index 00000000..78d7be30 Binary files /dev/null and b/src/assets/images/bg6.png differ diff --git a/src/assets/images/image1.png b/src/assets/images/image1.png new file mode 100644 index 00000000..768ec728 Binary files /dev/null and b/src/assets/images/image1.png differ diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index a02ec13b..2448bba7 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -46,10 +46,10 @@ @keyup.enter.native="handleQuery" /> - + - + @@ -673,7 +673,7 @@ {{ this.form.orderCode }} - {{ + {{ this.form.planWorkshop }} {{ @@ -771,7 +771,7 @@ - + {{ workVO.order.planCode }} @@ -784,9 +784,9 @@ {{ workVO.order.orderCode }} - {{ + {{ workVO.order.planLoopStart }} @@ -808,16 +808,13 @@ - + {{ workVO.equ.equipmentCode }} {{ workVO.equ.equipmentName }} - {{ - workVO.equ.equipmentLocation - }} {{ workVO.equ.equipmentTypeCode }} @@ -830,6 +827,9 @@ {{ workVO.equ.workshopName }} + {{ + workVO.equ.equipmentLocation + }} @@ -903,6 +903,12 @@ export default { dicts: ["device_order_status", "device_loop_type", "device_reach_standard"], data() { return { + WCS: { + "text-align": "left", + }, + WLS: { + width: "225px", + }, standardListVo: [], // 初始化VO workVO: { diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index ad5f60e0..9acbc8b0 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -200,6 +200,10 @@ label="处理状态" align="center" prop="orderStatus" /> + {{ parseTime(scope.row.orderBreakdownTime) }} -
确 定 - 返 回 + 返 回
@@ -882,7 +882,7 @@
- 返 回 + 返 回
@@ -1413,15 +1413,17 @@ export default { this.openView = false; }, // 审核返回按钮 - cancelCheckForm() { + cancelViewCheckForm() { this.viewCheck = false; }, + cancelOpenCheckForm() { + this.openCheck = false; + }, // 表单重置 reset() { this.form = { //报修图片 fileList: null, - // orderId: null, orderCode: null, equipmentCode: null, diff --git a/src/views/device/operation/index.vue b/src/views/device/operation/index.vue index d9dc7b45..494d5f1b 100644 --- a/src/views/device/operation/index.vue +++ b/src/views/device/operation/index.vue @@ -101,6 +101,7 @@ /> + - + + + + + 取 消 + + + + + + + + + + + + + + + + + + + + + + + + + @@ -530,6 +638,10 @@ import { addOperation, updateOperation, } from "@/api/device/operation"; + +import { + listRepairSparePartsRecord, +} from "@/api/device/sparePartsApplicationRecord"; import { parseTime } from "../../../utils/ruoyi"; export default { @@ -580,12 +692,16 @@ export default { showSearch: true, // 总条数 total: 0, + //备件总条数 + sparePartsTotal: 0, // 设备运行记录表格数据 operationList: [], // 弹出层标题 title: "", // 是否显示弹出层 open: false, + //是否显示查看更换备件 + openSpareParts: false, // 查询参数 queryParams: { pageNum: 1, @@ -594,6 +710,7 @@ export default { groupLine: null, equipmentName: null, equipmentCode: null, + spareUseEquipment: null, faultTime: null, actualOperationTime: null, operationTime: null, @@ -610,6 +727,12 @@ export default { attr3: null, createTimeArray: [], }, + //查询更换备件参数 + querySparePartsParams: { + pageNum: 1, + pageSize: 10, + equipmentCode: null, + }, // 表单参数 form: {}, // 表单校验 @@ -625,11 +748,16 @@ export default { }, methods: { parseTime, + // 生成表头序号 + indexMethod(index) { + return index + 1; + }, /** 查询设备运行记录列表 */ getList() { this.loading = true; listOperation(this.queryParams).then((response) => { this.operationList = response.rows; + // this.operationList.failureDescription.replace(/;/g, '
') this.total = response.total; this.loading = false; }); @@ -703,6 +831,22 @@ export default { this.title = "修改设备运行记录"; }); }, + /** 查看更换备件 */ + handleViewSpareParts(row) { + this.querySparePartsParams.equipmentCode = row.equipmentCode; + this.querySparePartsParams.createTime = row.createTime; + listRepairSparePartsRecord(this.querySparePartsParams).then((response) => { + this.sparePartsApplicationRecordList = response.rows; + this.sparePartsTotal = response.total; + this.openSpareParts = true; + this.title = "查看更换备件"; + }); + }, + /** 查看更换备件取消按钮 */ + cancelSpareParts() { + this.openSpareParts = false; + this.reset(); + }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate((valid) => { diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index ddca1156..ab19ecf9 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1881,6 +1881,11 @@ export default { _data.minutes / 60 + _data.seconds / 3600 ).toFixed(1) + "小时"; + + //如果不停机 + if(this.form.workDownMachine == '0'){ + this.form.faultDownTime = "0.0小时"; + } } //增加故障停机时间 @@ -2310,6 +2315,7 @@ export default { item.picturePath = this.listToString(item.picturePath); } }); + writeRepairOrder(this.form).then((response) => { this.openWrite = false; this.$modal.msgSuccess("填写维修记录成功！"); diff --git a/src/views/device/repairOrder/selectSpareParts.vue b/src/views/device/repairOrder/selectSpareParts.vue index 9aaf27e9..2b7148b3 100644 --- a/src/views/device/repairOrder/selectSpareParts.vue +++ b/src/views/device/repairOrder/selectSpareParts.vue @@ -62,6 +62,7 @@ diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue index a49d0597..0bee4ab2 100644 --- a/src/views/device/spotInspectionWork/index.vue +++ b/src/views/device/spotInspectionWork/index.vue @@ -33,8 +33,8 @@ @keyup.enter.native="handleQuery" /> - - + + - - + + diff --git a/src/views/kanban/Dryingprocess/index.vue b/src/views/kanban/Dryingprocess/index.vue index b4a03ce6..382e46b4 100644 --- a/src/views/kanban/Dryingprocess/index.vue +++ b/src/views/kanban/Dryingprocess/index.vue @@ -8,74 +8,215 @@
-
+
当天烘房情况
-
+
生产总数:80车生产总数: + {{ Dailyoutputnumber || "0" }} + 车
-
+
+
+
烘房
+
产量
+
标准产能
+
+
+
+
+
+
+ {{ card.equCode }} +
+
+ {{ card.totalNum }} +
+
+ {{ card.unitPro }} +
+
+
-
-
- 烘房 +
+
+
+
+
+ 烘房{{ card.i }} +
+
+
+
+
+ + {{ getTagModel(card.status) }} + +
+
烘房模式
+
+
+
+ {{ card.temperature }} + ℃ +
+
烘房温度
+
+
+ +
+
+
+ + {{ getTagText(card.dollyNumber) }} + +
+
门前数量
+
+
+
+ {{ card.waitmin }} + min +
+
保持时长
+
+
+
+
+ +
+
-
-
+
当天质量情况
-
+
车不合格异常数量: 04 车不合格异常数量: + {{ Qualityday.length || "0" }} + 车
-
烘房
-
产量
-
标准产能
+
烘房
+
托盘号
+
时间
-
-
-
烘房
-
产量
-
标准产能
+
+
+
+
+ {{ card.equCode }} +
+
+ {{ card.rfid }} +
+
+ {{ card.createTime || "0" }} +
@@ -83,7 +224,19 @@
-
+
+
+
当天烘房情况
+
+
+
+
+
+
+
@@ -94,20 +247,17 @@ + + diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 19e25a00..c0b12b93 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -66,6 +66,17 @@ v-hasPermi="['system:notice:remove']" >删除 + + 班组绑定 + @@ -125,56 +136,62 @@ - - - - - - - - - - - - - - - - - {{dict.label}} - - - - - - - - - + + + + + + + + + + + + + + + + + {{dict.label}} + + + + + + + + +
确 定 取 消
+ +
\ No newline at end of file + diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index d854ee3c..e172f3c6 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -957,9 +957,15 @@ :value="form.equipmentCategory" /> - {{ + {{ form.factoryWorkshop }} + + + 设备使用状况 diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue index 5b00c479..839c3377 100644 --- a/src/views/wms/product/index.vue +++ b/src/views/wms/product/index.vue @@ -62,6 +62,18 @@ >修改 + + 新增/修改附属属性 + 同步物料工艺 + >同步物料工艺