From 29545639b4a4e9d21b8b2ff0ad4803d26f5afff0 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 17 三月 2025 08:34:18 +0800
Subject: [PATCH] 1、erp地址修改为义乌erp 2、fixbug:中空李赛克出片问题 3、大屏显示字段显示异常
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 9febe07..f308d1b 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([])
@@ -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;"
--
Gitblit v1.8.0