From a96337c4f1734c64672a84c446048ae4f649769a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 11 七月 2024 10:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreen/largescreen.vue | 368 ++++++++++++++++++++++------------------------------
1 files changed, 154 insertions(+), 214 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index a972dbe..5cfa3c2 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,215 +1,179 @@
<template>
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
<el-scrollbar height="600px">
- <div id="app" style="margin-top: 20px;">
- <div
- :style="{ width: `${olWidth}px`, height: `${olHeight}px`,position: 'relative' }"
- >
- <div
- v-for="(rect, index) in adjustedRects"
- :key="rect.glass_id"
- class="rect"
- @click="showDialog(rect.glass_id)"
- :style="{ position: 'absolute',
- top: `${rect.y_axis}px`, left: `${rect.x_axis}px`, width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: getRectColor(rect.glass_state)
- }"
- >
- <!-- 绠ご -->
- <!-- <div id="arrow"></div>
- <div id="line"></div> -->
- <!-- <div class="centered-text" >NG24030401B01</div> -->
- <div class="centered-text">
- <div>{{ rect.process_id }}</div>
- <div style="margin-top: 50px;margin-left: -85px;">{{ rect.widtha }}*{{ rect.heighta }}</div>
- </div>
+ <div id="top" style="height: 150px;background-color: #911005;">
+ <v-chart ref="mychart1" class="chart" :option="optionPie "></v-chart>
</div>
- <!-- 鐐瑰嚮寮瑰嚭 -->
- <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
- {{ $t('order.dilapidation') }}
- </el-button>
- <el-button type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
- <el-icon class="el-icon--right"><Upload /></el-icon>
- {{ $t('order.Takeaway') }}</el-button>
- </el-dialog>
- </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 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" />
+ <el-table-column prop="patchProcesses" align="center" :label="$t('large.process')" min-width="100" />
+ <el-table-column fixed="right" :label="$t('large.operate')" align="center" width="100">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleBinda">{{ $t('large.mes') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div id="center" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 750px;">
+ <img src="../../assets/d1.png" alt="" style="margin-left: -30px; width: 110%;height: 100%;position: relative;">
+ </div>
+ <div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
+ <el-table height="240" ref="table" width="340px"
+ @selection-change="handleSelectionChange"
+ :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" min-width="50" />
+ <el-table-column prop="projectName" align="center" :label="$t('large.projectname')" min-width="50" />
+ </el-table>
+ </div>
+</div>
+<div id="bottom" style="margin-top: 10px;height: 190px;background-color: #911005;">
+ <el-table height="190" ref="table"
+ @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="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" />
+ <el-table-column
+ align="center"
+ :label="$t('large.warehousing')"
+ min-width="50"
+ prop="warehousing"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusType(scope.row.warehousing)">
+ {{ getStatusText(scope.row.warehousing) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="50" />
+ </el-table>
+</div>
</el-scrollbar>
</el-card>
+ <el-dialog v-model="blinda" top="10vh" width="80%" :title="$t('large.brokeno')">
+ <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="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" />
+ <el-table-column prop="project" align="center" :label="$t('large.projectname')" min-width="110" />
+ <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="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" />
+ <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="110" />
+ <el-table-column prop="height" align="center" :label="$t('large.height')" min-width="110" />
+ <el-table-column prop="shape" align="center" :label="$t('large.shape')" min-width="110" />
+ <el-table-column prop="responsibleProcess" align="center" :label="$t('large.responsibleprocess')" min-width="110" />
+ <el-table-column prop="patchProcesses" align="center" :label="$t('large.process')" min-width="110" />
+ <el-table-column prop="breakageQuantity" align="center" :label="$t('large.numberfractions')" min-width="110" />
+ <el-table-column prop="patchReason" align="center" :label="$t('large.breakreason')" min-width="110" />
+ <el-table-column prop="patchType" align="center" :label="$t('large.breaktype')" min-width="110" />
+ <el-table-column prop="responsiblePersonnel" align="center" :label="$t('large.responsiblepersonnel')" min-width="110" />
+ <el-table-column prop="responsibleEquipment" align="center" :label="$t('large.responsiblequipment')" min-width="110" />
+ <el-table-column prop="responsibleTeam" align="center" :label="$t('large.responsibleteam')" min-width="110" />
+ <el-table-column prop="patchArea" align="center" :label="$t('large.area')" min-width="110" />
+ <el-table-column prop="qualityInspector" align="center" :label="$t('large.inspector')" min-width="110" />
+ </el-table>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button @click="blinda = false">{{ $t('large.close') }}</el-button>
+ </div>
+ </template>
+ </el-dialog>
</template>
-<script setup lang="ts">
+<script setup>
import { Delete, Upload } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { ref, onMounted, onBeforeUnmount } from 'vue';
+import { ref, onMounted , onBeforeUnmount, reactive, computed, watch, shallowRef } 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()
- let language = ref(localStorage.getItem('lang') || 'zh')
-const blind = ref(false)
-const olWidth = ref();
-const olHeight = ref();
-const process_id = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
-const glass_id = ref();
-// const rects = ref([]); // 鐢ㄤ簬瀛樺偍鐭╁舰鏁版嵁鐨勫搷搴斿紡寮曠敤
-const currentGlassId = ref(null); // 瀛樺偍褰撳墠鐐瑰嚮鐭╁舰鐨� glass_id
-const adjustedRects = ref([]);
-// const handleBind = (row) => {
-// blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-// };
-// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glass_id
-function showDialog(glassId: number) {
- currentGlassId.value = glassId;
- blind.value = true;
-}
-onMounted(async () => {
- try {
- const response = await request.post('/cacheGlass/taskCache/currentCutTerritory'); // 鏇挎崲涓轰綘鐨凙PI绔偣
- if (response.code === 200) {
- // const process_id = response.data[0].process_id
- const rawRects = response.data; // 璁剧疆鐭╁舰鏁版嵁
- console.log(response.data);
- const { olWidth: newolWidth, olHeight: newolHeight, process_id: newprocess_id ,glass_id:newglass_id } = response.data; // 鑾峰彇灏哄
- olWidth.value = newolWidth; // 璁剧疆瀹瑰櫒瀹藉害
- olHeight.value = newolHeight; // 璁剧疆瀹瑰櫒楂樺害
- process_id.value = newprocess_id;
- glass_id.value = newglass_id;
-
- adjustedRects.value = rawRects.map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x_axis: (rect.x_axis*100) * 0.003, // 灏唜鍊奸櫎浠�3
- y_axis: (rect.y_axis*100) * 0.003,
- width: (rect.width*100) * 0.002 ,
- widtha: rect.width ,
- heighta: rect.height ,
- height:( rect.height*100) * 0.002 ,
- glass_state: rect.glass_state
- }));
- console.log(adjustedRects.value);
-
-
- // console.log( (rect.width*100) / 300 );
- } else {
- // console.error('Failed to fetch rectangles from API.');
- console.error('Failed to fetch rects from API.');
- }
- } catch (error) {
- // console.error('Error fetching rectangles :', error);
- console.error('Error fetching rects :', error);
- }
-});
-// 鐮存崯
-const handleDamage = async () => {
- try {
- var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201;
- console.log(url);
- const response = await request.post(url)
- // const response = await request.post('/cacheGlass/taskCache/identControls', {
- // identId: currentGlassId.value,
- // controlsId: 201,
- // })
- if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
- ElMessage.success(response.message);
- // window.location.reload()
- blind.value = false;
- updateRectStatus(currentGlassId.value, 201);
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
- }
-}
-catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-}
-// // 浜哄伐鎷胯蛋
-const handleManualTake = async () => {
- try {
- var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
- console.log(url);
- const response = await request.post(url)
- // const response = await request.post('/cacheGlass/taskCache/identControls', {
- // identId: currentGlassId.value,
- // controlsId: 200,
- // })
- if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
- ElMessage.success(response.message);
- // window.location.reload()
- blind.value = false;
- updateRectStatus(currentGlassId.value, 200);
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
- }
-}
-catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-}
-function getRectColor(state: number): string {
- switch (state) {
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
+// import * as echarts from 'echarts';
+// import 'echarts/lib/chart/pie';
+// import 'echarts/dist/echarts.min.css';
+const tableData = ref([])
+const tableDatab = ref([])
+const tableDatac = ref([])
+const blinda = ref(false)
+const handleBinda = (row) => {
+ blinda.value = true;
+};
+function getStatusType(warehousing) {
+ switch (warehousing) {
case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
- case 200:
- return 'lightblue';
- case 201:
- return '#f3d19e';
- default:
- return '#911005'; // 榛樿棰滆壊
+ return 'info';
+ case 1:
+ return 'warning';
+ case 2:
+ return 'success';
}
-}
-// 鏇存柊鐭╁舰鐘舵��
-function updateRectStatus(glassId: string, status: number) {
- adjustedRects.value.forEach(rect => {
- if (rect.glass_id === glassId) {
- rect.glass_state = status; // 鏇存柊鐭╁舰鐨勭姸鎬�
- }
- });
-}
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+}
+function getStatusText(warehousing) {
+ switch (warehousing) {
+ case 0:
+ return t('large.notstocked');
+ case 1:
+ return t('large.inboundstatus');
+ case 2:
+ 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 鐨勬暟鎹�
-
- // adjustedRects.value = data.currentCutTerritory[0]
- adjustedRects.value = data.currentCutTerritory[0].map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x_axis: (rect.x_axis*100) * 0.003, // 灏唜鍊奸櫎浠�3
- y_axis: (rect.y_axis*100) * 0.003,
- width: (rect.width*100) * 0.002 ,
- widtha: rect.width ,
- heighta: rect.height ,
- height:( rect.height*100) * 0.002 ,
- glass_state: rect.glass_state
- }));
- // console.log("鏇存柊鍚庢暟鎹�", tableData);
-
+ tableData.value = data.awaitingRepairs[0]
+ tableDatab.value = data.DoingTask[0]
+ tableDatac.value = data.orders[0]
};
-
-// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
-
onMounted(() => {
// fetchFlowCardId();
// fetchTableData(); // 鑾峰彇鏁版嵁
initializeWebSocket(socketUrl, handleMessage);
});
-
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
});
+
+
</script>
<style scoped>
@@ -224,32 +188,8 @@
align-items: center;
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
}
-#rect {
- position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
- /* 鍏朵粬鏍峰紡 */
-}
-
-#arrow {
- position: absolute;
- top: 70%; /* 绠ご浣嶄簬鐭╁舰涓棿 */
- left: 200px; /* 绠ご鍦ㄧ煩褰㈠乏渚т竴浜涜窛绂� */
- transform: translateY(-50%); /* 鍨傜洿灞呬腑 */
- width: 0;
- height: 0;
- border-top: 10px solid transparent; /* 涓婅竟妗� */
- border-bottom: 10px solid transparent; /* 涓嬭竟妗� */
- border-right: 20px solid #911005; /* 鍙宠竟妗嗭紝褰㈡垚绠ご */
- /* 鏍规嵁闇�瑕佽皟鏁磋竟妗嗗ぇ灏忓拰棰滆壊 */
-}
-
-#line {
- position: absolute;
- top: 70%; /* 鐩寸嚎浣嶄簬鐭╁舰涓棿 */
- left: 210px; /* 鐩寸嚎鍦ㄧ澶村彸渚т竴浜涜窛绂� */
- transform: translateY(-50%); /* 鍨傜洿灞呬腑 */
- height: 2px; /* 鐩寸嚎鐨勯珮搴� */
- width: 240px; /* 鐩寸嚎鐨勯暱搴︼紝鏍规嵁闇�瑕佽皟鏁� */
- background-color: #911005; /* 鐩寸嚎鐨勯鑹� */
-}
-
+#dialog-footer{
+ text-align: center;
+ margin-top: -15px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0