From db806d3d0b0761538b15907d1ea3caf84dc3f01d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 七月 2024 08:31:37 +0800
Subject: [PATCH] 下片测试
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 35 +++++++-
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 6
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 2
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 6
UI-Project/src/views/largescreen/largescreen.vue | 184 +++++++++++++++++++++++++++++++++++++--------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 4
6 files changed, 189 insertions(+), 48 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index f478ff0..f8d1715 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -42,11 +42,11 @@
import { initializeWebSocket } from '@/utils/WebSocketService';
import { WebSocketHost } from '@/utils/constants';
const racks = ref([
- { x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG123456',downGlassInfoList:"" } },
+ { x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: '',downGlassInfoList:"" } },
- { x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG12345678',downGlassInfoList:"" } },
+ { x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: '',downGlassInfoList:"" } },
- { x: 140, y: 320, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' ,downGlassInfoList:""} }
+ { x: 140, y: 320, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: '' ,downGlassInfoList:""} }
]);
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index c7fa71e..7f31ea5 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -42,11 +42,11 @@
import { initializeWebSocket } from '@/utils/WebSocketService';
import { WebSocketHost ,host} from '@/utils/constants'
const racks = ref([
- { x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG123456' } },
+ { x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: '' } },
- { x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG12345678' } },
+ { x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: '' } },
- { x: 140, y: 320, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' } }
+ { x: 140, y: 320, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: '' } }
]);
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index d3f31ba..ef90cf6 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -177,12 +177,34 @@
closeWebSocket();
});
-// beforeUnmount(() => {
-// closeWebSocket();
-// });
+const getTagType =(status) => {
+ return status === 1 ? 'success' : 'danger';
+ // 鏍规嵁鐘舵�佸�煎喅瀹氭爣绛剧被鍨嬶紝杩欓噷鍋囪鐘舵�佷负1鏃朵负鎴愬姛锛堢豢鑹诧級锛屽惁鍒欎负澶辫触锛堢孩鑹诧級
+ }
+ const toggleStatus = (row) => {
+ // 鍒囨崲鏂欐灦鐘舵�佺殑閫昏緫
+ row.enableState = 1 - row.enableState; // Toggle between 0 and 1
+ // 姝ゅ鍙互娣诲姞淇濆瓨鐘舵�佺殑閫昏緫锛屾瘮濡傝皟鐢� API 鏇存柊鏁版嵁
+ updateRowStatus(row);
+ };
-// setInterval(fetchTableData, 2000)
+ const updateRowStatus = async (row) => {
+ try {
+ // 鍋囪浣犵殑鍚庣 API 鎺ユ敹 PUT 璇锋眰锛屽苟涓旈渶瑕佷紶閫� row.id 鍜� row.enableState 鍙傛暟
+
+
+ const response = await request.post('unLoadGlass/downWorkStation/updateDownWorkstation', {
+ enableState: 1 - row.enableState
+
+ });
+ console.log('Updated row status:', response.data);
+ // 鍙互鏍规嵁鍚庣杩斿洖鐨勬暟鎹繘琛岃繘涓�姝ュ鐞嗭紝姣斿鏇存柊鏈湴鐘舵�佺瓑
+ } catch (error) {
+ console.error('Error updating row status:', error);
+ // 澶勭悊閿欒鎯呭喌锛屾瘮濡傛彁绀虹敤鎴锋洿鏂板け璐�
+ }
+};
</script>
@@ -210,7 +232,10 @@
prop="enableState"
>
<template #default="scope">
- <el-tag type="success" >{{ scope.row.enableState==1? $t('reportWork.enable') : $t('reportWork.unenable')}}</el-tag>
+
+ <el-tag :type="getTagType(scope.row.enableState)" @click="toggleStatus(scope.row)">
+ {{ scope.row.enableState === 1 ? $t('reportWork.enable') : $t('reportWork.unenable') }}
+ </el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" :label="$t('reportWork.operate')" align="center" width="200">
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index 5cfa3c2..4f2d4ae 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,15 +1,21 @@
<template>
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
<el-scrollbar height="600px">
- <div id="top" style="height: 150px;background-color: #911005;">
- <v-chart ref="mychart1" class="chart" :option="optionPie "></v-chart>
+ <div id="top" style="height: 150px;display: flex;">
+ <div v-for="(rect, index) in adjustedRects"
+ :key="index"
+ :style="{ width: '1000px', height: '100px',margin: '5px',}">
+ <div ref="setChartDom(index, $el)" style="width: 100%; height: 100%;"></div>
+ <div style="text-align: center;">
+ {{ rect.thisProcess }}</div>
+ </div>
</div>
<div style="display: flex;">
<div id="centerleft" style="margin-top: 10px;height: 240px;width: 340px;background-color: #911005;">
<el-table height="240" ref="table" width="340px"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="orderId" align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column fixed prop="orderId" align="center" :label="$t('large.number')" min-width="110" />
<el-table-column prop="project" align="center" :label="$t('large.projectname')" min-width="100" />
<el-table-column prop="responsibleProcess" align="center" :label="$t('large.responsibleprocess')" min-width="100" />
<el-table-column prop="breakageQuantity" align="center" :label="$t('large.numberfractions')" min-width="110" />
@@ -38,7 +44,7 @@
@selection-change="handleSelectionChange"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="orderId" align="center" :label="$t('large.orderId')" min-width="50" />
- <el-table-column prop="customerName" align="center" :label="$t('large.customerName')" min-width="90" />
+ <el-table-column prop="customerName" align="center" :show-overflow-tooltip="true" :label="$t('large.customerName')" min-width="90" />
<el-table-column prop="project" align="center" :label="$t('large.project')" min-width="50" />
<el-table-column prop="area" align="center" :label="$t('large.are')" min-width="50" />
<el-table-column prop="quantity" align="center" :label="$t('large.quantity')" min-width="50" />
@@ -63,8 +69,8 @@
<el-table height="500" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="reportingWorkTime" align="center" :label="$t('large.time')" min-width="110" />
- <el-table-column prop="orderId" align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column prop="reportingWorkTime" fixed align="center" :label="$t('large.time')" min-width="110" />
+ <el-table-column prop="orderId" fixed align="center" :label="$t('large.number')" min-width="110" />
<el-table-column prop="reportingWorkId" align="center" :label="$t('large.jobnumber')" min-width="120" />
<el-table-column prop="productionId" align="center" :label="$t('large.productionnumber')" min-width="130" />
<el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="140" />
@@ -72,7 +78,7 @@
<el-table-column prop="batch" align="center" :label="$t('large.batch')" min-width="110" />
<el-table-column prop="reviewer" align="center" :label="$t('large.detailID')" min-width="110" />
<el-table-column prop="orderSort" align="center" :label="$t('large.serialnumber')" min-width="110" />
- <el-table-column prop="productName" align="center" :label="$t('large.productname')" min-width="180" />
+ <el-table-column prop="productName" align="center" :label="$t('large.productname')" :show-overflow-tooltip="true" min-width="220" />
<el-table-column prop="technologyNumber" align="center" :label="$t('large.serial')" min-width="110" />
<el-table-column prop="glassAddress" align="center" :label="$t('large.slicemarker')" min-width="130" />
<el-table-column prop="patchNum" align="center" :label="$t('large.numberpatches')" min-width="110" />
@@ -100,18 +106,22 @@
<script setup>
import { Delete, Upload } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { ref, onMounted , onBeforeUnmount, reactive, computed, watch, shallowRef } from "vue";
+import { ref, onMounted , onBeforeUnmount, reactive, computed, shallowRef, onUnmounted, watchEffect } from "vue";
import request from "@/utils/request"
import { WebSocketHost ,host} from '@/utils/constants'
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
-// import * as echarts from 'echarts';
-// import 'echarts/lib/chart/pie';
-// import 'echarts/dist/echarts.min.css';
+import * as echarts from 'echarts';
const tableData = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
+const adjustedRects = ref([]);
+const chartRefs = ref([]);
+const thisProcess = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
+// 瀹氫箟涓�涓搷搴斿紡寮曠敤鏉ュ瓨鍌ㄥ浘琛ㄥ疄渚�
+const chartDom = ref(null);
+let chartInstance = null;
const blinda = ref(false)
const handleBinda = (row) => {
blinda.value = true;
@@ -136,33 +146,141 @@
return t('large.allstatus');
}
}
-// function getStatusType(warehousing: number) {
-// switch (warehousing) {
-// case 0:
-// return 'success';
-// case 1:
-// return 'primary';
-// case 2:
-// return 'danger';
-// }
-// }
-// function getStatusText(warehousing: number) {
-// switch (warehousing) {
-// case 0:
-// return t('large.notstocked');
-// case 1:
-// return t('large.inboundstatus');
-// case 2:
-// return t('large.allstatus');
-// }
-// }
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
const handleMessage = (data) => {
- // 鏇存柊 tableData 鐨勬暟鎹�
tableData.value = data.awaitingRepairs[0]
tableDatab.value = data.DoingTask[0]
tableDatac.value = data.orders[0]
+ // adjustedRects.value = data.device[0].map(rect => ({
+ // ...rect,
+ // completed: rect.completedQuantity,
+ // breakage: rect.breakageQuantity,
+ // thisProcess: rect.thisProcess,
+ // }));
};
+let socket;
+// 璁剧疆鍥捐〃 DOM 寮曠敤
+function setChartDom(index, el) {
+ if (!chartRefs.value[index]) {
+ chartRefs.value[index] = { dom: el, chart: null };
+ } else {
+ chartRefs.value[index].dom = el;
+ }
+}
+onMounted(() => {
+ socket = new WebSocket(socketUrl);
+ socket.onmessage = (event) => {
+ const data = JSON.parse(event.data);
+ adjustedRects.value = data.device[0].map(rect => ({
+ ...rect,
+ completedQuantity: rect.completedQuantity,
+ breakageQuantity: rect.breakageQuantity,
+ thisProcess: rect.thisProcess,
+ }));
+ console.log(adjustedRects.value);
+ // updateCharts();
+ };
+ adjustedRects.value.forEach((rect, index) => {
+ initChart(index, rect);
+ });
+ // };
+});
+
+
+function initChart(index, rect) {
+ const { dom } = chartRefs.value[index] || { dom: null };
+ if (dom) {
+ const chart = echarts.init(dom);
+ const option = {
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ orient: 'vertical',
+ left: 'left',
+ },
+ series: [
+ {
+ name: '楗肩姸鍥�',
+ type: 'pie',
+ radius: ['50%','70%'],
+ data: [
+ {value: rect.completedQuantity, name: '鍔犲伐鏁伴噺'},
+ {value: rect.breakageQuantity, name: '娆＄牬鏁伴噺'},
+ console.log(rect.breakageQuantity)
+ ],
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ };
+ chart.setOption(option);
+ chartRefs.value[index] = { ...chartRefs.value[index], chart };
+
+}
+console.log(chartRefs.value[index]);
+}
+
+// 鏇存柊鍥捐〃
+// function updateCharts() {
+// adjustedRects.value.forEach((rect, index) => {
+// const { chart } = chartRefs.value[index] || { chart: null };
+// if (chart) {
+// chart.setOption({
+// series: [{
+// data: [
+// { value: rect.completedQuantity, name: '鍔犲伐鏁伴噺' },
+// { value: rect.breakageQuantity, name: '娆＄牬鏁伴噺' },
+// ],
+// }],
+// });
+// }
+// });
+// }
+// 鍒濆鍖栧浘琛�
+// function initChart(index, rect) {
+// const chartDom = ref(`chartDom${index}`).value;
+// console.log(ref(`chartDom${index}`).value);
+// const chart = echarts.init(chartDom);
+// const option = {
+// tooltip: {
+// trigger: 'item'
+// },
+// legend: {
+// orient: 'vertical',
+// left: 'left',
+// },
+// series: [
+// {
+// name: '楗肩姸鍥�',
+// type: 'pie',
+// radius: ['50%','70%'],
+// data: [
+// {value: rect.completed, name: '鍔犲伐鏁伴噺'},
+// {value: rect.breakage, name: '娆＄牬鏁伴噺'},
+// ],
+// emphasis: {
+// itemStyle: {
+// shadowBlur: 10,
+// shadowOffsetX: 0,
+// shadowColor: 'rgba(0, 0, 0, 0.5)'
+// }
+// }
+// }
+// ]
+// };
+// chart.setOption(option);
+// }
+// 娓呯悊 WebSocket 杩炴帴
+onUnmounted(() => {
+ socket.close();
+});
+
onMounted(() => {
// fetchFlowCardId();
// fetchTableData(); // 鑾峰彇鏁版嵁
@@ -172,8 +290,6 @@
console.log("鍏抽棴浜�")
closeWebSocket();
});
-
-
</script>
<style scoped>
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 686084b..0dcc65a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -451,7 +451,7 @@
}
Integer endCell = null;
- if (isBind) {
+ if (!isBind) {
//鑾峰彇绌烘灦瀛愪俊鎭紝灏嗙┖鏋跺瓙淇℃伅缁戝畾娴佺▼鍗�
DownWorkstation emptyDownWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>()
.isNull(DownWorkstation::getFlowCardId).orderByDesc(DownWorkstation::getWorkstationId).last("limit 1"));
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index d3918be..8df8e09 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -16,8 +16,8 @@
mes:
maxWidth: 2500 #涓嬬墖鐨勬渶澶у搴�
maxHeight: 2000 #涓嬬墖鐨勬渶澶ч珮搴�
- minWidth: 400 #涓嬬墖鐨勬渶澶у搴�
- minHeight: 400 #涓嬬墖鐨勬渶澶ч珮搴�
+ minWidth: 400 #涓嬬墖鐨勬渶灏忓搴�
+ minHeight: 400 #涓嬬墖鐨勬渶灏忛珮搴�
throughWidth: 3000
throughHeight: 2500
threshold: 5 #涓嬬墖鐨勬渶澶ч槇鍊�
--
Gitblit v1.8.0