严智鑫
2025-03-13 faa3b0410410415c4ad788c7e0955ef97158df2e
贴膜机任务数据显示异常修改
7个文件已修改
69 ■■■■■ 已修改文件
JiuMuMesParent/gateway/src/main/java/com/mes/GateWayApplication.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/config.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/utils/constants.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/KanbanDisplay/kanbanDisplay.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Lamination/lamination.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/ManualReporting/manualReporting.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
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 "";
    }
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
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";
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));
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;//当前页面的设备ID
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;//当前页面的设备ID
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(() => {