From c83a7afadb0f6f762ba9938420677f2f93f3c64f Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 24 Feb 2025 14:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentStatusAndParams/index.vue | 16 ++-- .../monitoring/equipmentVisualize/line-pot.js | 74 +++++++++---------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/views/monitoring/equipmentStatusAndParams/index.vue b/src/views/monitoring/equipmentStatusAndParams/index.vue index 5eba9e5e..b5a2e2b2 100644 --- a/src/views/monitoring/equipmentStatusAndParams/index.vue +++ b/src/views/monitoring/equipmentStatusAndParams/index.vue @@ -198,7 +198,7 @@ export default { pageNo: 1, pageSize: 10, factoryId: null, - productionLineId: null, + productionLineId: [], equipmentId: null, }, total: 0, @@ -251,7 +251,7 @@ export default { // 清除设备选框里的选项 this.searchBarFormConfig[2].selectOptions = []; this.queryParams.equipmentId = undefined; - this.queryParams.productionLineId = undefined; + this.queryParams.productionLineId = []; this.$refs['search-bar'].formInline.equipmentId = undefined; this.$refs['search-bar'].formInline.productionLineId = undefined; getPdList(id).then((res) => { @@ -261,13 +261,13 @@ export default { }, handleSearchBarBtnClick(btn) { - const { equipmentId, productionLineId } = btn; + const { equipmentId, productionLineId,factoryId } = btn; if (equipmentId) this.queryParams.equipmentId = equipmentId; else this.queryParams.equipmentId = null; if (productionLineId) - this.queryParams.productionLineId = productionLineId; - else this.queryParams.productionLineId = null; - this.queryParams.factoryId = btn.factoryId || null; + this.queryParams.productionLineId = [productionLineId]; + else this.queryParams.productionLineId = []; + this.queryParams.factoryId = factoryId || null; this.getList(); }, @@ -276,8 +276,8 @@ export default { this.loading = true; const { data } = await this.$axios({ url: '/monitoring/equipment-monitor/realtime-page', - method: 'get', - params: this.queryParams, + method: 'POST', + data: this.queryParams, }); this.list = data.list; this.total = data.total; diff --git a/src/views/monitoring/equipmentVisualize/line-pot.js b/src/views/monitoring/equipmentVisualize/line-pot.js index 83c420e3..91916cad 100644 --- a/src/views/monitoring/equipmentVisualize/line-pot.js +++ b/src/views/monitoring/equipmentVisualize/line-pot.js @@ -440,7 +440,7 @@ linePot.line1canvas= [ linePot.line2canvas= [ { name: '穿梭机', - id:84, + id:34, isEQ: true, //是否是设备 x: 5, y: 40, @@ -449,7 +449,7 @@ linePot.line2canvas= [ }, { name: '机械手1', - id:85, + id:35, isEQ: true, //是否是设备 x: 70, y: 85, @@ -458,7 +458,7 @@ linePot.line2canvas= [ }, { name: '机械手2', - id:86, + id:36, isEQ: true, //是否是设备 x: 130, y: 85, @@ -467,7 +467,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188182611783682', + id: '152', isL: true, //是否L形状 remark: 'M01-M18(异型)', line: [ @@ -485,7 +485,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188872511877122', + id: '174', remark: '0M201-0M204', x: 290, y: 50, @@ -494,7 +494,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188872511877122', + id: '170', remark: '0M101-0M104', x: 290, y: 140, @@ -503,7 +503,7 @@ linePot.line2canvas= [ }, { name: '磨边机1', - id:88, + id:38, isEQ: true, //是否是设备 x: 332, y: 40, @@ -512,7 +512,7 @@ linePot.line2canvas= [ }, { name: '磨边机2', - id:88, + id:39, isEQ: true, //是否是设备 x: 332, y: 130, @@ -521,7 +521,7 @@ linePot.line2canvas= [ }, { name: '清洗机1', - id:88, + id:40, isEQ: true, //是否是设备 x: 384, y: 40, @@ -530,7 +530,7 @@ linePot.line2canvas= [ }, { name: '清洗机2', - id:88, + id:41, isEQ: true, //是否是设备 x: 384, y: 130, @@ -539,7 +539,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188872511877122', + id: '192', remark: '1M201-1M214', x: 436, y: 50, @@ -548,7 +548,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188872511877122', + id: '178', remark: '1M101-1M114', x: 436, y: 140, @@ -557,7 +557,7 @@ linePot.line2canvas= [ }, { name: '打孔机1', - id:88, + id:42, isEQ: true, //是否是设备 x: 488, y: 40, @@ -566,7 +566,7 @@ linePot.line2canvas= [ }, { name: '打孔机2', - id:88, + id:43, isEQ: true, //是否是设备 x: 488, y: 130, @@ -575,7 +575,7 @@ linePot.line2canvas= [ }, { name: '清洗机1', - id:88, + id:44, isEQ: true, //是否是设备 x: 540, y: 40, @@ -584,7 +584,7 @@ linePot.line2canvas= [ }, { name: '清洗机2', - id:88, + id:45, isEQ: true, //是否是设备 x: 540, y: 130, @@ -593,7 +593,7 @@ linePot.line2canvas= [ }, { name: '丝印机1', - id:88, + id:46, isEQ: true, //是否是设备 x: 592, y: 40, @@ -602,7 +602,7 @@ linePot.line2canvas= [ }, { name: '丝印机2', - id:88, + id:47, isEQ: true, //是否是设备 x: 592, y: 130, @@ -611,7 +611,7 @@ linePot.line2canvas= [ }, { name: '预热炉1', - id:88, + id:'1888114426233548801', isEQ: true, //是否是设备 x: 644, y: 40, @@ -620,7 +620,7 @@ linePot.line2canvas= [ }, { name: '预热炉2', - id:88, + id:'1888114614981423106', isEQ: true, //是否是设备 x: 644, y: 130, @@ -629,7 +629,7 @@ linePot.line2canvas= [ }, { name: '镀膜机1', - id:88, + id:148, isEQ: true, //是否是设备 x: 696, y: 40, @@ -638,7 +638,7 @@ linePot.line2canvas= [ }, { name: '镀膜机2', - id:88, + id:149, isEQ: true, //是否是设备 x: 696, y: 130, @@ -647,7 +647,7 @@ linePot.line2canvas= [ }, { name: '一次固化1', - id:88, + id:48, isEQ: true, //是否是设备 x: 748, y: 40, @@ -656,7 +656,7 @@ linePot.line2canvas= [ }, { name: '一次固化2', - id:88, + id:49, isEQ: true, //是否是设备 x: 748, y: 130, @@ -665,7 +665,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188872511877122', + id: '218', remark: '2M20A-2M205(L)', isL: true, //是否L形状 line: [ @@ -679,7 +679,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188872511877122', + id: '206', remark: '2M10A-2M106', x: 810, y: 140, @@ -688,7 +688,7 @@ linePot.line2canvas= [ }, { name: '钢化炉', - id:100, + id:50, isEQ: true, //是否是设备 x: 912, y: 130, @@ -697,7 +697,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188872511877122', + id: '229', remark: '3M101-3M105', x: 994, y: 140, @@ -706,7 +706,7 @@ linePot.line2canvas= [ }, { name: '清洗机', - id:88, + id:51, isEQ: true, //是否是设备 x: 1116, y: 130, @@ -715,7 +715,7 @@ linePot.line2canvas= [ }, { name: '铺纸机', - id:88, + id:52, isEQ: true, //是否是设备 x: 1168, y: 130, @@ -724,7 +724,7 @@ linePot.line2canvas= [ }, { name: '铺纸机', - id:88, + id:53, isEQ: true, //是否是设备 x: 1220, y: 130, @@ -733,7 +733,7 @@ linePot.line2canvas= [ }, { name: '连线', - id: '1889188872511877122', + id: '234', remark: '4M100-4M109', x: 1272, y: 140, @@ -742,7 +742,7 @@ linePot.line2canvas= [ }, { name: '下片机1', - id:104, + id:54, isEQ: true, //是否是设备 x: 1365, y: 105, @@ -751,7 +751,7 @@ linePot.line2canvas= [ }, { name: '下片机2', - id:104, + id:55, isEQ: true, //是否是设备 x: 1430, y: 105, @@ -1509,7 +1509,7 @@ linePot.line5canvas= [ }, { name: '预热炉1', - id:88, + id:'1891715839681425409', isEQ: true, //是否是设备 x: 490, y: 50, @@ -1518,7 +1518,7 @@ linePot.line5canvas= [ }, { name: '预热炉2', - id:88, + id:'1891715916583989249', isEQ: true, //是否是设备 x: 490, y: 100, @@ -1527,7 +1527,7 @@ linePot.line5canvas= [ }, { name: '预热炉3', - id:88, + id:'1891715982178709505', isEQ: true, //是否是设备 x: 490, y: 150,