From faa3b0410410415c4ad788c7e0955ef97158df2e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 13 三月 2025 22:37:20 +0800
Subject: [PATCH] 贴膜机任务数据显示异常修改
---
UI-Project/config.js | 8 ++--
UI-Project/src/views/Lamination/lamination.vue | 1
JiuMuMesParent/gateway/src/main/java/com/mes/GateWayApplication.java | 2
UI-Project/src/views/ManualReporting/manualReporting.vue | 7 +--
UI-Project/src/utils/constants.js | 4 +-
UI-Project/src/views/KanbanDisplay/kanbanDisplay.vue | 41 +++++++++++++-------
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java | 6 +-
7 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/JiuMuMesParent/gateway/src/main/java/com/mes/GateWayApplication.java b/JiuMuMesParent/gateway/src/main/java/com/mes/GateWayApplication.java
index d203316..a16e459 100644
--- a/JiuMuMesParent/gateway/src/main/java/com/mes/GateWayApplication.java
+++ b/JiuMuMesParent/gateway/src/main/java/com/mes/GateWayApplication.java
@@ -13,7 +13,7 @@
@SpringBootApplication
@EnableDiscoveryClient
public class GateWayApplication {
-
+
public static void main(String[] args) {
SpringApplication.run(GateWayApplication.class, args);
}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
index 3070099..f448c8e 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java
@@ -280,7 +280,6 @@
} catch (Exception e) {
log.info("浜や簰閫昏緫閿欒");
}
-
modbusTcp1.close();
//log.info("鏃犲彲鎵ц鐨勬潯浠�");
}
@@ -315,11 +314,12 @@
clientSocket.close();
return receivedMessage;
} catch (Exception e) {
- e.printStackTrace();
+ log.info("鎵爜寮傚父");
+ //e.printStackTrace();
}
clientSocket.close();
} catch (Exception e) {
- e.printStackTrace();
+ log.info("ip鎴栫鍙ｅ紓甯�");
}
return "";
}
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 2fd0f18..a653f48 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,13 +1,13 @@
export default {
- // serverUrl: "localhost:88/api",
- // serverUrl2: "localhost:88"
+ serverUrl: "localhost:88/api",
+ serverUrl2: "localhost:88"
// serverUrl: "10.36.164.253:88/api",
// serverUrl2: "10.36.164.253:88"
- serverUrl: "10.36.164.200:88/api",
- serverUrl2: "10.36.164.200:88"
+ // serverUrl: "10.36.164.200:88/api",
+ // serverUrl2: "10.36.164.200:88"
// serverUrl2: "127.0.0.1:88"npm
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 1b60cea..f268dae 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
- // export const WebSocketHost = "localhost";
+ export const WebSocketHost = "localhost";
// export const WebSocketHost = "10.36.164.253";
- export const WebSocketHost = "10.36.164.200";
+// export const WebSocketHost = "10.36.164.200";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/KanbanDisplay/kanbanDisplay.vue b/UI-Project/src/views/KanbanDisplay/kanbanDisplay.vue
index e5fd828..2f445e8 100644
--- a/UI-Project/src/views/KanbanDisplay/kanbanDisplay.vue
+++ b/UI-Project/src/views/KanbanDisplay/kanbanDisplay.vue
@@ -8,19 +8,7 @@
<script>
export default {
mounted() {
- this.drawLineChart('drawLineChart_day1', 1);
- this.drawLineChart('drawLineChart_day2', 1);
- this.drawLineChart('drawLineChart_day3', 1);
- this.drawLineChart('drawLineChart_day4', 1);
- this.drawLineChart('drawLineChart_day5', 1);
- //this.drawLineChart('drawLineChart_week', 1);
- this.drawBarchart('drawBarchart', 1);
- },
- methods: {
- //鏂规硶
- drawLineChart(name, data) {
- var myChart = echarts.init(document.getElementById(name));
- myChart.setOption({ // 缁樺埗鍥捐〃
+ const OptionDay={ // 缁樺埗鍥捐〃
title: {
text: '浜ч噺鐪嬫澘绀轰緥'
},
@@ -94,7 +82,32 @@
}
]
- });
+ }
+ this.drawDay('drawLineChart_day11',OptionDay, 1);
+ // this.drawLineChart('drawLineChart_day11', 1);
+ // this.drawLineChart('drawLineChart_day21', 1);
+ // this.drawLineChart('drawLineChart_day31', 1);
+ // this.drawLineChart('drawLineChart_day41', 1);
+ // this.drawLineChart('drawLineChart_day51', 1);
+ //this.drawLineChart('drawLineChart_week', 1);
+ //this.drawBarchart('drawBarchart', 1);
+ },
+ methods: {
+ //鏂规硶
+ draw(name, Option,data) {
+ var myChart = echarts.init(document.getElementById(name));
+ myChart.setOption(Option);
+ },
+ drawDay(name, Option,data) {
+ Option.title.text="鏃ョ湅鏉�";
+ console.log(Option);
+ this.draw(name, Option,data);
+ },
+ drawLineChart(name, Option,data) {
+ console.log(name);
+ console.log(data);
+ var myChart = echarts.init(document.getElementById(name));
+ myChart.setOption(Option);
},
drawBarchart(name, data) {
var myChart = echarts.init(document.getElementById(name));
diff --git a/UI-Project/src/views/Lamination/lamination.vue b/UI-Project/src/views/Lamination/lamination.vue
index e94835b..73f211d 100644
--- a/UI-Project/src/views/Lamination/lamination.vue
+++ b/UI-Project/src/views/Lamination/lamination.vue
@@ -23,6 +23,7 @@
const downLineTask = ref([]);
const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
+//console.log(userInfo.user.menus[0].pages[7].params);
const pageParams=userInfo.user.menus[0].pages[7].params;
const pageParamsJson=JSON.parse(pageParams);
const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
diff --git a/UI-Project/src/views/ManualReporting/manualReporting.vue b/UI-Project/src/views/ManualReporting/manualReporting.vue
index 79d2735..c7c992c 100644
--- a/UI-Project/src/views/ManualReporting/manualReporting.vue
+++ b/UI-Project/src/views/ManualReporting/manualReporting.vue
@@ -25,7 +25,7 @@
const searcheh = ref();
const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
-const pageParams=userInfo.user.menus[0].pages[4].params;
+const pageParams=userInfo.user.menus[0].pages[6].params;
const pageParamsJson=JSON.parse(pageParams);
const machineId = pageParamsJson.machineId;//褰撳墠椤甸潰鐨勮澶嘔D
console.log(machineId);
@@ -41,7 +41,7 @@
// 鏇存柊 tableData 鐨勬暟鎹�
//taskinggoruby.value = data.taskinggoruby[0];
//loadData.value =getDataSort(data.taskingList[0]);
- let dataJson = data[""+machineId][0];
+ const dataJson = data[""+machineId][0];
loadData.value = dataJson.taskingList[0];
findMachine.value = dataJson.machine[0];
@@ -61,8 +61,7 @@
};
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage2 = (data) => {
- let dataJson = data[""+machineId][0];
- downLineTask.value = dataJson.downLineTask[0];
+ downLineTask.value = data.downLineTask[0];
// console.log(data);
};
onUnmounted(() => {
--
Gitblit v1.8.0