From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 128 +++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 53 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index f6da641..4390eac 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -13,7 +13,6 @@
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
-const timeRange = ref([])
let socket = null;
const rawGlassStorageDetailList = ref([])
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/largenScreen`;
@@ -25,13 +24,13 @@
const edgOneTasks = ref([])
const edgTwoTasks = ref([])
const engineeringOne = ref([])
-const engineeringTow = ref([])
+const engineeringTwo = ref([])
const socketUrl1 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreen`;
const handleMessage1 = (data) => {
edgOneTasks.value = data.edgOneTasks[0];
edgTwoTasks.value = data.edgTwoTasks[0];
engineeringOne.value = data.engineeringOne[0];
- engineeringTow.value = data.engineeringTow[0];
+ engineeringTwo.value = data.engineeringTwo[0];
};
let socket2 = null;
@@ -43,20 +42,13 @@
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
};
-
-const handleBinda = async (row) => {
- blinda.value = true;
- await fetchFlowCardId(row.orderId);
-};
-const fetchFlowCardId = async (orderId) => {
+const tableDatad = ref([]);
+const patternUsage = async () => {
try {
- const response = await request.post('/loadGlass/order/order/selectOrderdetail', {
- orderId: orderId
- })
+ const response = await request.post('/glassStorage/rawGlassStorageDetails/patternUsage?width=' + ptnusage.value.width + '&height=' + ptnusage.value.height + '&thickness=' + ptnusage.value.thickness + '&films=' + ptnusage.value.films);
if (response.code == 200) {
ElMessage.success(response.message);
- tableData.value = response.data;
- console.log(tableData.value);
+ tableDatad.value = response.data;
} else {
ElMessage.error(response.message);
}
@@ -65,10 +57,18 @@
console.error(error);
}
}
+const ptnusage=ref({
+ width: '',
+ height: '',
+ thickness: '',
+ films: ''
+})
+
+
// 鐐瑰嚮涓嬫柟寮圭獥
const handlehistorical = (row) => {
blindb.value = true;
- historical()
+ // historical()
};
// 鍦ㄧ粍浠舵寕杞芥椂璁剧疆榛樿鏃堕棿鑼冨洿
onMounted(() => {
@@ -78,7 +78,7 @@
const endTime = dayjs().startOf('minute'); // 褰撳墠鏃堕棿锛岀簿纭埌鍒嗛挓
const startTime = endTime.subtract(1, 'day').startOf('minute'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
// 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
- timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
+ // timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
});
// onMounted(() => {
// socket = initializeWebSocket(socketUrl, handleMessage);
@@ -98,10 +98,23 @@
<template>
<div style="height: 500px;">
<div class="awatch">
- <img src="../../assets/screen.png" alt="Screen"
- style="max-width: 48%; max-height: 100%; margin-top: 50px; float: left; position: relative;" />
+ <div class="img-screen" alt="Screen">
+ <!-- 閽㈠寲鑹插潡 -->
+ <div v-if="temperingGlassInfoList>0" class="tempering" style="width: 50px;height: 22px;top: 354px;left: 228px;position: absolute;background-color: red;"></div>
+ <div v-if="temperingGlassInfoList>1" class="tempering" style="width: 50px;height: 22px;top: 354px;left: 284px;position: absolute;background-color: red;"></div>
+ <!-- 鍒囧壊鍙拌壊鍧� -->
+ <div v-if="engineeringOne.length>1" class="slicing" style="width: 50px;height: 22px;top: 575px;left: 453px;position: absolute;background-color: red;"></div>
+ <div v-if="engineeringTwo.length>1" class="slicing" style="width: 50px;height: 22px;top: 625px;left: 453px;position: absolute;background-color: red;"></div>
+ <!-- 鍘熺墖浠撳偍鑹插潡 -->
+ <div class="raw" style="width: 31px;height: 32px;top: 571px;left: 300px;position: absolute;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+item.remainQuantity+"px;height: 5px;background-color: red;"'></div>
+ </div>
+ <!-- <div class="raw" style="width: 31px;height: 32px;top: 571px;left: 300px;position: absolute;background-color: red;">
+ <div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+item.remainQuantity+"px;height: 5px;background-color: red;"'></div>
+ </div> -->
+ </div>
<div class="clickable-area" @click="handlehistorical"
- style="position: relative; width: 175px; height: 240px; top: 570px; left: 310px;"></div>
+ style="position: relative;width: 110px;height: 140px;top: 603px;left: 297px;"></div>
</div>
<div style="height: 190px;width: 48%;float: right;">
<el-table height="500" ref="table" @selection-change="handleSelectionChange" :data="tableDatac"
@@ -131,56 +144,48 @@
<!-- 鐐瑰嚮涓嬫柟寮圭獥 -->
<el-dialog v-model="blindb" top="10vh" width="90%">
<div style="display: flex;">
- <el-select :placeholder="$t('basicData.coatingtypes')" clearable style="width: 270px;margin-left: 10px;"
+ <el-input v-model="ptnusage.width" placeholder="璇疯緭鍏ュ搴�" style="width: 270px;margin-left: 10px;" clearable></el-input>
+ <el-input v-model="ptnusage.height" placeholder="璇疯緭鍏ラ珮搴�" style="width: 270px;margin-left: 10px;" clearable></el-input>
+ <el-input v-model="ptnusage.thickness" placeholder="璇疯緭鍏ュ帤搴�" style="width: 270px;margin-left: 10px;" clearable></el-input>
+ <el-input v-model="ptnusage.films" placeholder="璇疯緭鍏ヨ啘绯�" style="width: 270px;margin-left: 10px;" clearable></el-input>
+ <!-- <el-select :placeholder="$t('basicData.coatingtypes')" clearable style="width: 270px;margin-left: 10px;"
v-model="taskStat">
<el-option v-for="item in optionsa" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span>
+ </el-select> -->
+ <!-- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span> -->
<!-- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
:end-placeholder="$t('reportmanage.endtime')">
</el-date-picker> -->
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�"
- :start-placeholder="$t('reportmanage.starttime')" style="margin-left: 15px;" value-format="YYYY-MM-DD hh:mm:ss"
- :end-placeholder="$t('reportmanage.endtime')">
- </el-date-picker>
- <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
+ <!-- <el-date-picker
+ v-model="timeRange"
+ type="datetimerange"
+ range-separator="鑷�"
+ :start-placeholder="$t('reportmanage.starttime')"
+ style="margin-left: 15px;"
+ value-format="YYYY-MM-DD hh:mm:ss"
+ :end-placeholder="$t('reportmanage.endtime')">
+ </el-date-picker> -->
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="patternUsage()">{{
$t('reportmanage.inquire')
}}</el-button>
</div>
<el-table ref="table" style="margin-top: 20px;height: 650px;" :data="tableDatad"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
- <el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
- <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
- <el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
- <el-table-column align="center" :label="$t('film.taskstatus')" min-width="80" prop="taskState">
- <template #default="scope">
- <el-tag :type="getStatusTypeb(scope.row.taskState)">
- {{ getStatusTextb(scope.row.taskState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column align="center" :label="$t('film.enabletype')" min-width="80" prop="taskType">
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskType)">
- {{ getStatusTexta(scope.row.taskType) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="120" />
- <el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
+ <el-table-column prop="patternWidth" align="center" :label="$t('瀹�')" min-width="80" />
+ <el-table-column prop="patternHeight" align="center" :label="$t('楂�')" min-width="80" />
+ <el-table-column prop="patternThickness" align="center" :label="$t('鍘氬害')" min-width="80" />
+ <el-table-column prop="filmsId" align="center" :label="$t('鑶滅郴')" min-width="120" />
+ <el-table-column prop="totalCount" align="center" :label="$t('鎬绘暟閲�')" min-width="120" />
+ <el-table-column prop="count" align="center" :label="$t('绗煎唴鏁伴噺')" min-width="120" />
+ <el-table-column prop="finishCount" align="center" :label="$t('涓婄墖鏁伴噺')" min-width="120" />
+ <el-table-column prop="damageCount" align="center" :label="$t('鐮存崯鏁伴噺')" min-width="120" />
</el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
</el-dialog>
<el-dialog v-model="blinda" top="5vh" width="85%">
<el-table height="650" ref="table" @selection-change="handleSelectionChange" :data="tableData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId')" min-width="110" />
+ <el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId1')" min-width="110" />
<el-table-column prop="project" align="center" :label="$t('large.project')" min-width="110" />
<el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="110" />
<el-table-column prop="orderNumber" align="center" :label="$t('large.serialnumber')" min-width="110" />
@@ -243,6 +248,23 @@
height: 460px;
}
+.img-screen {
+ max-width: 48%;
+ max-height: 100%;
+ margin-top: 50px;
+ float: left;
+ position: relative;
+ background-image: url('../../assets/screen.png');
+ width: 808px;
+ height: 841px;
+ background-size: contain;
+ background-repeat: no-repeat;
+ background-position: center;
+ /* width: 100%;
+ height: 0;
+ padding-bottom: 50%; */
+}
+
.clickable-area {
cursor: pointer;
/* 鎸囩ず杩欐槸涓�涓彲鐐瑰嚮鐨勫尯鍩� */
--
Gitblit v1.8.0