From c28ef8556cd40c671976aadf010fb43d7c39633b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 20 三月 2025 16:16:45 +0800
Subject: [PATCH] 修改大屏样式
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 338 +++++++++++++++++++++++++++++++------------------------
1 files changed, 189 insertions(+), 149 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 427749a..597a53a 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -1,17 +1,18 @@
<script setup>
-import {onBeforeUnmount, onMounted, onUnmounted, ref} from "vue";
-import {useRouter} from "vue-router"
-import {host, WebSocketHost} from '@/utils/constants'
+import { onBeforeUnmount, onMounted, onUnmounted, ref, computed } 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} 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 blindc = ref(false)
+const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
let socket = null;
const rawGlassStorageDetailList = ref([])
@@ -44,7 +45,7 @@
let socket2 = null;
const temperingTaskType = ref([])
const temperingGlassInfoList = ref([])
-const temperingGlassInfoOutList = ref([])
+const temperingGlassInfoInList = ref([])
const socketUrl2 = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/largenScreen`;
const handleMessage2 = (data) => {
temperingTaskType.value = data.temperingTaskType[0];
@@ -53,11 +54,16 @@
numBoxes3.value = temperingTaskType.value;
boxStart3();
}
- temperingGlassInfoOutList.value = data.temperingGlassInfoOutList[0];
- if (numBoxes4.value != temperingGlassInfoOutList.value) {
- numBoxes4.value = temperingGlassInfoOutList.value;
- boxStart3();
+ if (temperingGlassInfoList.value > 1) {
+ numBoxes4.value = 1;
+ } else {
+ numBoxes4.value = 0;
}
+ temperingGlassInfoInList.value = data.temperingGlassInfoInList[0];
+ // if (numBoxes4.value != temperingGlassInfoOutList.value) {
+ // numBoxes4.value = temperingGlassInfoOutList.value;
+ // boxStart3();
+ // }
};
let socket3 = null;
const bigStorageCageUsage = ref([])
@@ -97,9 +103,9 @@
const tableData = ref([]);
const dynamicColumns = ref([]);
const flowCardDetail = async (orderId) => {
- blinda.value= true;
+ blinda.value = true;
try {
- const response = await request.post('/glassStorage/flow_card/flowCardReportForms?orderId=' + orderId );
+ const response = await request.post('/glassStorage/flow_card/flowCardReportForms?orderId=' + orderId);
if (response.code == 200) {
ElMessage.success(response.message);
tableData.value = response.data;
@@ -182,13 +188,13 @@
const numBoxes3 = ref(5);
const numBoxes4 = ref(1);
const speed = 0.1;
-const maxX = 200; // 缁堢偣X鍧愭爣
-const maxY = -73; // 缁堢偣Y鍧愭爣
-const maxX2 = 250; // 缁堢偣X鍧愭爣
-const maxY2 = -165; // 缁堢偣Y鍧愭爣
-const maxX3 = 100; // 缁堢偣X鍧愭爣
-const maxY3 = -75; // 缁堢偣Y鍧愭爣
-const maxX4 = 60; // 缁堢偣X鍧愭爣
+const maxX = 250; // 缁堢偣X鍧愭爣
+const maxY = -90; // 缁堢偣Y鍧愭爣
+const maxX2 = 313; // 缁堢偣X鍧愭爣
+const maxY2 = -204; // 缁堢偣Y鍧愭爣
+const maxX3 = 125; // 缁堢偣X鍧愭爣
+const maxY3 = -105; // 缁堢偣Y鍧愭爣
+const maxX4 = 80; // 缁堢偣X鍧愭爣
const maxY4 = 0; // 缁堢偣Y鍧愭爣
const delayFrames = 600; // 姣忎釜 div 鐨勫欢杩熷抚鏁�
const boxes = ref([]);
@@ -373,7 +379,7 @@
const iframe2 = ref(false);
const handlehistorical2 = () => {
iframe2.value = true;
- iframeUrl2.value =`${window.location.origin}/#/Returns/upreturnhistory`;;
+ iframeUrl2.value = `${window.location.origin}/#/Returns/upreturnhistory`;;
};
const iframeUrl3 = ref('');
const iframe3 = ref(false);
@@ -385,7 +391,7 @@
const iframe4 = ref(false);
const handlehistorical4 = () => {
iframe4.value = true;
- iframeUrl4.value =`${window.location.origin}/#/Caching/cachingbeforehistory`;
+ iframeUrl4.value = `${window.location.origin}/#/Caching/cachingbeforehistory`;
};
const iframeUrl5 = ref('');
const iframe5 = ref(false);
@@ -423,186 +429,226 @@
iframe10.value = true;
iframeUrl10.value = `${window.location.origin}/#/largescreendisplay/statistics`;
};
+const transposedData = computed(() => {
+ const keys = Object.keys(productionVO.value[0] || {});
+ return keys.map(key => {
+ const row = { name: fieldNames[key] || key };
+ productionVO.value.forEach((item, index) => {
+ row[`value${index}`] = item[key];
+ });
+ return row;
+ });
+});
+const fieldNames = {
+ date: t('large.date'),
+ countOutOne: t('large.countOutOne'),
+ totalAreaOutOne: t('large.totalAreaOutOne'),
+ countOutTwo: t('large.countOutTwo'),
+ totalAreaOutTwo: t('large.totalAreaOutTwo'),
+ countIn: t('large.countIn'),
+ totalAreaIn: t('large.totalAreaIn'),
+ countOut: t('large.countOut'),
+ totalAreaOut: t('large.totalAreaOut'),
+ hollowCountOutOne: t('large.hollowCountOutOne'),
+ hollowTotalAreaOutOne: t('large.hollowTotalAreaOutOne'),
+ hollowCountOutTwo: t('large.hollowCountOutTwo'),
+ hollowTotalAreaOutTwo: t('large.hollowTotalAreaOutTwo'),
+};
+
</script>
<template>
<div style="height: 500px;">
<el-dialog v-model="iframe1" top="10vh" width="95%">
- <iframe :src="iframeUrl1" marginwidth="2000px" marginheight="2000px" width="100%" height="700px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl1" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe2" top="10vh" width="95%">
- <iframe :src="iframeUrl2" marginwidth="2000px" marginheight="2000px" width="100%" height="700px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl2" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe3" top="10vh" width="95%">
- <iframe :src="iframeUrl3" marginwidth="2000px" marginheight="2000px" width="100%" height="700" frameborder="0"></iframe>
+ <iframe :src="iframeUrl3" marginwidth="2000px" marginheight="2000px" width="100%" height="700"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe4" top="10vh" width="95%">
- <iframe :src="iframeUrl4" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl4" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe5" top="10vh" width="95%">
- <iframe :src="iframeUrl5" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl5" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe6" top="10vh" width="95%">
- <iframe :src="iframeUrl6" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl6" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe7" top="10vh" width="95%">
- <iframe :src="iframeUrl7" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl7" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe8" top="10vh" width="95%">
- <iframe :src="iframeUrl8" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl8" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe9" top="10vh" width="95%">
- <iframe :src="iframeUrl9" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl9" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe10" top="10vh" width="95%">
- <iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ <iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
</el-dialog>
- <!-- 鐢熶骇缁熻 -->
- <div style="height: 100px;width: 88%;float: right;position: absolute;" @click="handlehistorical10">
- <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" />
- <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />
- <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />
- <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="50" />
- <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="50" />
- <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="50" />
- <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
- <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="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;"
- @click="flowCardDetail(scope.row.orderId)">{{ $t('large.mes') }}</el-button>
- </template>
- </el-table-column> -->
- </el-table>
- </div>
- <div class="awatch">
+
+ <div class="awatch" style="display: flex;">
+ <!-- 鐢熶骇缁熻 -->
+ <div style="height: 100px;width: 15%;float: right;">
+ <el-table height="540" ref="table" :data="transposedData" @click="handlehistorical10"
+ :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
+ <el-table-column prop="name" align="center" min-width="100" />
+ <el-table-column v-for="(item, index) in productionVO" :key="index" :prop="'value' + index" align="center"
+ min-width="80" />
+ </el-table>
+ <div>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical1">{{
+ $t('large.historicaltasks1') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical2">{{
+ $t('large.historicaltasks2') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical3">{{
+ $t('large.historicaltasks3') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical4">{{
+ $t('large.historicaltasks4') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical5">{{
+ $t('large.historicaltasks5') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical6">{{
+ $t('large.historicaltasks6') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical7">{{
+ $t('large.historicaltasks7') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical8">{{
+ $t('large.historicaltasks8') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="handlehistorical9">{{
+ $t('large.historicaltasks9') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info"
+ @click="blindc=true">{{
+ $t('large.order') }}</el-button>
+ </div>
+ </div>
<div class="img-screen" alt="Screen">
<!-- 閽㈠寲鑹插潡 -->
+ <div v-if="temperingGlassInfoInList > 0" class="tempering"
+ style="width: 55px;height: 25px;top: 359px;left: 162px;position: absolute;background-color: #911005;"></div>
<div v-if="temperingGlassInfoList > 0" class="tempering"
- style="width: 50px;height: 22px;top: 354px;left: 228px;position: absolute;background-color: #911005;"></div>
+ style="width: 66px;height: 28px;top: 355px;left: 284px;position: absolute;background-color: #911005;"></div>
<div v-if="temperingGlassInfoList > 1" class="tempering"
- style="width: 50px;height: 22px;top: 354px;left: 284px;position: absolute;background-color: #911005;"></div>
+ style="width: 66px;height: 28px;top: 355px;left: 358px;position: absolute;background-color: #911005;"></div>
<!-- 鍒囧壊鍙拌壊鍧� -->
<div v-if="engineeringOne.length > 1" class="slicing"
- style="width: 50px;height: 22px;top: 575px;left: 453px;position: absolute;background-color: #911005;"></div>
+ style="width: 59px;height: 29px;top: 629px;left: 562px;position: absolute;background-color: #911005;"></div>
<div v-if="engineeringTwo.length > 1" class="slicing"
- style="width: 50px;height: 22px;top: 625px;left: 453px;position: absolute;background-color: #911005;"></div>
+ style="width: 59px;height: 29px;top: 692px;left: 562px;position: absolute;background-color: #911005;"></div>
<!-- 鍘熺墖浠撳偍鑹插潡 -->
- <div class="raw" style="width: 31px;height: 32px;top: 571px;left: 300px;position: absolute;">
+ <div class="raw" style="width: 35px;height: 40px;top: 624px;left: 372px;position: absolute;">
<div v-for="(item, index) in rawGlassStorageDetailList.slice(0, 7)" :key="index"
- :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5.6px;background-color: #911005;"'></div>
</div>
- <div class="raw" style="width: 31px;height: 47px;top: 610px;left: 300px;position: absolute;">
+ <div class="raw" style="width: 35px;height: 58px;top: 673px;left: 372px;position: absolute;">
<div v-for="(item, index) in rawGlassStorageDetailList.slice(8, 17)" :key="index"
- :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5.6px;background-color: #911005;"'></div>
</div>
- <div class="raw" style="width: 31px;height: 13px;top: 675px;left: 300px;position: absolute;">
+ <div class="raw" style="width: 35px;height: 20px;top: 751px;left: 372px;position: absolute;">
<div v-for="(item, index) in rawGlassStorageDetailList.slice(18, 20)" :key="index"
- :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5.6px;background-color: #911005;"'></div>
</div>
- <div class="raw" style="width: 31px;height: 22px;top: 657px;left: 370px;position: absolute;">
+ <div class="raw" style="width: 35px;height: 27px;top: 732px;left: 459px;position: absolute;">
<div v-for="(item, index) in rawGlassStorageDetailList.slice(21, 25)" :key="index"
- :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5.6px;background-color: #911005;"'></div>
</div>
- <div class="raw" style="width: 31px;height: 9px;top: 561px;left: 370px;position: absolute;">
+ <div class="raw" style="width: 35px;height: 12px;top: 611px;left: 459px;position: absolute;">
<div v-for="(item, index) in rawGlassStorageDetailList.slice(26, 27)" :key="index"
- :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5.6px;background-color: #911005;"'></div>
</div>
- <div class="raw" style="width: 31px;height: 9px;top: 612px;left: 370px;position: absolute;">
+ <div class="raw" style="width: 35px;height: 12px;top: 6676px;left: 459px;position: absolute;">
<div v-for="(item, index) in rawGlassStorageDetailList.slice(28, 29)" :key="index"
- :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5.6px;background-color: #911005;"'></div>
</div>
<!-- 纾ㄨ竟鑹插潡 -->
<div class="container"
- style="position: relative;width: 20px;height: 20px;top: 572px;left: 648px;position: absolute;">
- <div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style" ></div>
+ style="position: relative;width: 20px;height: 20px;top: 628px;left: 804px;position: absolute;">
+ <div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style"></div>
</div>
<div class="container"
- style="position: relative;width: 20px;height: 20px;top: 625px;left: 700px;position: absolute;">
- <div v-for="(box, index) in boxes2" :key="index" class="box" :style="box.style" ></div>
+ style="position: relative;width: 20px;height: 20px;top: 690px;left: 867px;position: absolute;">
+ <div v-for="(box, index) in boxes2" :key="index" class="box" :style="box.style"></div>
</div>
<!-- 閽㈠寲杩愬姩鑹插潡 -->
<div class="container"
- style="position: relative;width: 20px;height: 20px;top: 438px;left: 196px;position: absolute;">
+ style="position: relative;width: 20px;height: 20px;top: 468px;left: 250px;position: absolute;">
<div v-for="(box, index) in boxes3" :key="index" class="box" :style="box.style"></div>
</div>
<div class="container"
- style="position: relative;width: 20px;height: 20px;top: 355px;left: 496px;position: absolute;">
+ style="position: relative;width: 20px;height: 20px;top: 357px;left: 618px;position: absolute;">
<div v-for="(box, index) in boxes4" :key="index" class="box" :style="box.style"></div>
</div>
<!-- 閽㈠寲鍓嶅ぇ鐞嗙墖鑹插潡 -->
- <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(0, 1)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 447px;left: 314px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(0, 1)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 471px;left: 389px;position: absolute;background-color: #911005;"'>
</div>
- <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(1, 2)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 463px;left: 314px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(1, 2)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 491px;left: 389px;position: absolute;background-color: #911005;"'>
</div>
- <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(2, 3)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 478px;left: 314px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(2, 3)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 510px;left: 389px;position: absolute;background-color: #911005;"'>
</div>
- <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(3, 4)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 493px;left: 314px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(3, 4)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 530px;left: 389px;position: absolute;background-color: #911005;"'>
</div>
<!-- 涓┖鍓嶅ぇ鐞嗙墖鑹插潡 -->
- <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(0, 1)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 337px;left: 671px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(0, 1)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 334px;left: 832px;position: absolute;background-color: #911005;"'>
</div>
- <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(1, 2)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 353px;left: 671px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(1, 2)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 354px;left: 832px;position: absolute;background-color: #911005;"'>
</div>
- <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(2, 3)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 369px;left: 671px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(2, 3)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 374px;left: 832px;position: absolute;background-color: #911005;"'>
</div>
- <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(3, 4)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 385px;left: 671px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(3, 4)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 394px;left: 832px;position: absolute;background-color: #911005;"'>
</div>
- <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(4, 5)" :key="index"
- :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 401px;left: 671px;position: absolute;background-color: #911005;"'>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(4, 5)" :key="index"
+ :style='"position: relative;width: " + (46 * item.percentage / 100) + "px;height: 17px;top: 414px;left: 832px;position: absolute;background-color: #911005;"'>
</div>
+ <div class="clickable-area" @click="handlehistorical"
+ style="position: relative;width: 140px;height: 170px;top: 603px;left: 364px;"></div>
</div>
-
- <div class="clickable-area" @click="handlehistorical"
- style="position: relative;width: 110px;height: 100px;top: 603px;left: 297px;"></div>
- </div>
- <!-- 璁㈠崟鎯呭喌 -->
- <div style="height: 190px;width: 52%;float: right;">
- <div>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical1">{{ $t('large.historicaltasks1') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical2">{{ $t('large.historicaltasks2') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical3">{{ $t('large.historicaltasks3') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical4">{{ $t('large.historicaltasks4') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical5">{{ $t('large.historicaltasks5') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical6">{{ $t('large.historicaltasks6') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical7">{{ $t('large.historicaltasks7') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical8">{{ $t('large.historicaltasks8') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical9">{{ $t('large.historicaltasks9') }}</el-button>
-
- </div>
- <el-table height="700" ref="table" :data="orderDTOS"
- :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" :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" />
- <el-table-column prop="percent" align="center" :label="$t('large.percent')" min-width="50" />
- <el-table-column align="center" :label="$t('large.operate')" min-width="50">
- <template #default="scope">
- <el-button type="text" style="margin-left: 10px;margin-bottom: 10px;"
- @click="flowCardDetail(scope.row.orderId)">{{ $t('large.mes') }}</el-button>
- </template>
- </el-table-column>
- </el-table>
</div>
</div>
+ <el-dialog v-model="blindc" top="10vh" width="90%">
+ <el-table height="700" ref="table" :data="orderDTOS"
+ :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" :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" />
+ <el-table-column prop="percent" align="center" :label="$t('large.percent')" min-width="50" />
+ <el-table-column align="center" :label="$t('large.operate')" min-width="50">
+ <template #default="scope">
+ <el-button type="text" style="margin-left: 10px;margin-bottom: 10px;"
+ @click="flowCardDetail(scope.row.orderId)">{{ $t('large.mes') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
<!-- 鍘熺墖浣跨敤璇︽儏 -->
<el-dialog v-model="blindb" top="10vh" width="90%">
<div style="display: flex;">
@@ -648,14 +694,8 @@
<!-- <el-table-column prop="reportWorkQuantity" align="center" :label="$t('large.reportWorkQuantity')" min-width="110" />
<el-table-column prop="reportWorkQuantityCount" align="center" :label="$t('large.reportWorkQuantityCount')" min-width="110" /> -->
<!-- 鍔ㄦ�佺敓鎴愮殑 reportWorkQuantity 鍒� -->
- <el-table-column
- v-for="column in dynamicColumns"
- :key="column.prop"
- :prop="column.prop"
- :label="column.label"
- align="center"
- min-width="110"
- />
+ <el-table-column v-for="column in dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label"
+ align="center" min-width="110" />
</el-table>
</el-dialog>
</template>
@@ -694,17 +734,17 @@
}
.img-screen {
- max-width: 48%;
- max-height: 100%;
- margin-top: 50px;
- float: left;
+ /* max-width: 48%;
+ max-height: 100%; */
+ /* margin-top: 50px; */
+ /* float: left; */
position: relative;
background-image: url('../../assets/screen.png');
- width: 808px;
- height: 841px;
+ width: 1002px;
+ height: 878px;
background-size: contain;
background-repeat: no-repeat;
- background-position: center;
+ /* background-position: center; */
/* width: 100%;
height: 0;
padding-bottom: 50%; */
--
Gitblit v1.8.0