From f87f14a9aea395831edb8fb2e709ceaf274aa632 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 三月 2025 15:19:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 9febe07..733a850 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -1,16 +1,17 @@
<script setup>
-import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
-import { useRouter } from "vue-router"
-import { host, WebSocketHost } from '@/utils/constants'
+import {onBeforeUnmount, onMounted, onUnmounted, ref} from "vue";
+import {useRouter} from "vue-router"
+import {host, WebSocketHost} from '@/utils/constants'
import request from "@/utils/request"
-import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
+import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import dayjs from 'dayjs';
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useI18n } from 'vue-i18n'
+import {ElMessage} from 'element-plus'
+import {useI18n} from 'vue-i18n'
+
const router = useRouter()
const blinda = ref(false)
const blindb = ref(false)
-const { t } = useI18n()
+const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
let socket = null;
const rawGlassStorageDetailList = ref([])
@@ -224,7 +225,7 @@
style: {
width: '15px',
height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
+ backgroundColor: i % 2 === 0 ? '#911005' : '#911005',
position: 'absolute',
transform: `translate(0px, 0px)`
}
@@ -242,7 +243,7 @@
style: {
width: '15px',
height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
+ backgroundColor: i % 2 === 0 ? '#911005' : '#911005',
position: 'absolute',
transform: `translate(0px, 0px)`
}
@@ -260,7 +261,7 @@
style: {
width: '15px',
height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
+ backgroundColor: i % 2 === 0 ? '#911005' : '#911005',
position: 'absolute',
transform: `translate(0px, 0px)`
}
@@ -447,7 +448,7 @@
</el-dialog>
<!-- 鐢熶骇缁熻 -->
<div style="height: 190px;width: 88%;float: right;position: absolute;" @click="handlehistorical9">
- <el-table height="700" ref="table" :data="productionVO"
+ <el-table height="100" ref="table" :data="productionVO"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="date" align="center" :label="$t('large.date')" min-width="70" />
<el-table-column prop="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />
@@ -460,8 +461,9 @@
<el-table-column prop="totalAreaOut" align="center" :label="$t('large.totalAreaOut')" min-width="40" />
<el-table-column prop="hollowCountOutOne" align="center" :label="$t('large.hollowCountOutOne')" min-width="40" />
<el-table-column prop="hollowTotalAreaOutOne" align="center" :label="$t('large.hollowTotalAreaOutOne')" min-width="40" />
- <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
<el-table-column prop="hollowCountOutTwo" align="center" :label="$t('large.hollowCountOutTwo')" min-width="40" />
+ <el-table-column prop="hollowTotalAreaOutTwo" align="center" :label="$t('large.hollowTotalAreaOutTwo')"
+ min-width="40"/>
<!-- <el-table-column align="center" :label="$t('large.operate')" min-width="50">
<template #default="scope">
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;"
@@ -620,8 +622,8 @@
<el-dialog v-model="blinda" top="5vh" width="85%">
<el-table height="650" ref="table" :data="tableData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="processId" fixed align="center" :label="$t('large.processId')" min-width="110" />
- <el-table-column prop="glassChild" align="center" :label="$t('large.productname')" min-width="110" />
+ <el-table-column prop="processId" fixed align="center" :label="$t('large.processId')" min-width="150" />
+ <el-table-column prop="glassChild" align="center" :label="$t('large.productname')" min-width="150" />
<el-table-column prop="orderNumber" align="center" :label="$t('large.serialnumber')" min-width="110" />
<el-table-column prop="technologyNumber" align="center" :label="$t('large.slicemarker')" min-width="110" />
<el-table-column prop="width" align="center" :label="$t('large.width')" min-width="110" />
--
Gitblit v1.8.0