From e42b239ac2c2a922172badbe32afaa4ba4f615f8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 14 四月 2025 20:17:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/largescreendisplay/screendisplay.vue |  774 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 629 insertions(+), 145 deletions(-)

diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index f57c2f4..bbdbab3 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeUnmount, onMounted, onUnmounted, ref, computed } from "vue";
+import { onBeforeUnmount, onMounted, onUnmounted, ref, computed, nextTick } from "vue";
 import { useRouter } from "vue-router"
 import { host, WebSocketHost } from '@/utils/constants'
 import request from "@/utils/request"
@@ -7,7 +7,12 @@
 import dayjs from 'dayjs';
 import { ElMessage } from 'element-plus'
 import { useI18n } from 'vue-i18n'
+import * as echarts from 'echarts';
 
+const load = ref(true)
+const edg = ref(true)
+const temp = ref(true)
+const hollow = ref(true)
 const router = useRouter()
 const blinda = ref(false)
 const blindb = ref(false)
@@ -27,6 +32,7 @@
 const edgTwoTasks = ref([])
 const engineeringOne = ref([])
 const engineeringTwo = ref([])
+
 const socketUrl1 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreen`;
 const handleMessage1 = (data) => {
   edgOneTasks.value = data.edgOneTasks[0];
@@ -41,6 +47,87 @@
     numBoxes2.value = edgTwoTasks.value.length;
     boxStart2();
   }
+  const pieChartVOS = ref([]);
+  pieChartVOS.value = data.pieChartVOS[0];
+
+  let oneFinish = ref();
+  let twoFinish = ref();
+  let oneunFinish = ref();
+  let twounFinish = ref();
+  if (load.value) {
+    oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
+    twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
+    oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+    twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+  } else {
+    oneFinish = pieChartVOS.value[0].oneCompletedArea;
+    twoFinish = pieChartVOS.value[0].twoCompletedArea;
+    oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+    twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+  }
+
+  const chartDomOne = chartOne.value;
+  if (!chartDomOne) {
+    console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+    return;
+  }
+  const myChartOne = echarts.init(chartDomOne);
+  const optionOne = {
+    title: {
+      text: t('large.load'),
+      subtext: '',
+      left: 'right'
+    },
+    tooltip: {
+      trigger: 'item'
+    },
+    legend: {
+      orient: 'vertical',
+      left: 'left'
+    },
+    series: [
+      {
+        name: '',
+        type: 'pie',
+        radius: '50%',
+        data: [
+          { value: oneFinish, name: t('large.oneFinish') },
+          { value: twoFinish, name: t('large.twoFinish') },
+          { value: oneunFinish, name: t('large.oneunFinish') },
+          { value: twounFinish, name: t('large.twounFinish') },
+        ],
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ],
+    graphic: [
+      {
+        type: 'rect',
+        left: 'center',
+        top: 0,
+        shape: {
+          width: 80,
+          height: 30
+        },
+        style: {
+          text: load.value == true ? t('large.quantity') : t('large.are'),
+          fill: '#5470C6',
+          stroke: '#000',
+          lineWidth: 1
+        },
+        onclick: function () {
+          load.value = !load.value;
+        }
+      }
+    ]
+  };
+
+  myChartOne.setOption(optionOne);
 };
 let socket2 = null;
 const temperingTaskType = ref([])
@@ -60,29 +147,371 @@
     numBoxes4.value = 0;
   }
   temperingGlassInfoInList.value = data.temperingGlassInfoInList[0];
-  // if (numBoxes4.value != temperingGlassInfoOutList.value) {
-  //   numBoxes4.value = temperingGlassInfoOutList.value;
-  //   boxStart3();
-  // }
+  const pieChartVOS = ref([]);
+  pieChartVOS.value = data.pieChartVOS[0];
+  let oneFinish = ref();
+  let ondDamage = ref();
+  let oneunFinish = ref();
+  if (temp.value) {
+    oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
+    ondDamage = pieChartVOS.value[0].oneDamageQuantity;
+    oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+  } else {
+    oneFinish = pieChartVOS.value[0].oneCompletedArea;
+    ondDamage = pieChartVOS.value[0].oneDamageArea;
+    oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+  }
+
+  const chartDomOne = chartThree.value;
+  if (!chartDomOne) {
+    console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+    return;
+  }
+  const myChartOne = echarts.init(chartDomOne);
+  const optionOne = {
+    title: {
+      text: t('large.temp'),
+      subtext: '',
+      left: 'right'
+    },
+    tooltip: {
+      trigger: 'item'
+    },
+    legend: {
+      orient: 'vertical',
+      left: 'left'
+    },
+    series: [
+      {
+        name: '',
+        type: 'pie',
+        radius: '50%',
+        data: [
+          { value: oneFinish, name: t('large.oneFinish') },
+          { value: ondDamage, name: t('large.ondDamage') },
+          { value: oneunFinish, name: t('large.oneunFinish') },
+        ],
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ],
+    graphic: [
+      {
+        type: 'rect',
+        left: 'center',
+        top: 0,
+        shape: {
+          width: 80,
+          height: 30
+        },
+        style: {
+          text: temp.value == true ? t('large.quantity') : t('large.are'),
+          fill: '#5470C6',
+          stroke: '#000',
+          lineWidth: 1
+        },
+        onclick: function () {
+          temp.value = !temp.value;
+        }
+      }
+    ]
+  };
+
+  myChartOne.setOption(optionOne);
 };
 let socket3 = null;
 const bigStorageCageUsage = ref([])
 const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/largenScreen`;
 const handleMessage3 = (data) => {
   bigStorageCageUsage.value = data.bigStorageCageUsage[0];
+  const pieChartVOS = ref([]);
+  pieChartVOS.value = data.pieChartVOS[0];
+  let oneFinish = ref();
+  let twoFinish = ref();
+  let oneunFinish = ref();
+  let twounFinish = ref();
+  if (edg.value) {
+    oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
+    twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
+    oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+    twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+  } else {
+    oneFinish = pieChartVOS.value[0].oneCompletedArea;
+    twoFinish = pieChartVOS.value[0].twoCompletedArea;
+    oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+    twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+  }
+
+  const chartDomOne = chartTwo.value;
+  if (!chartDomOne) {
+    console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+    return;
+  }
+  const myChartOne = echarts.init(chartDomOne);
+  const optionOne = {
+    title: {
+      text: t('large.edg'),
+      subtext: '',
+      left: 'right'
+    },
+    tooltip: {
+      trigger: 'item'
+    },
+    legend: {
+      orient: 'vertical',
+      left: 'left'
+    },
+    series: [
+      {
+        name: '',
+        type: 'pie',
+        radius: '50%',
+        data: [
+          { value: oneFinish, name: t('large.oneFinish') },
+          { value: twoFinish, name: t('large.twoFinish') },
+          { value: oneunFinish, name: t('large.oneunFinish') },
+          { value: twounFinish, name: t('large.twounFinish') },
+        ],
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ],
+    graphic: [
+      {
+        type: 'rect',
+        left: 'center',
+        top: 0,
+        shape: {
+          width: 80,
+          height: 30
+        },
+        style: {
+          text: edg.value == true ? t('large.quantity') : t('large.are'),
+          fill: '#5470C6',
+          stroke: '#000',
+          lineWidth: 1
+        },
+        onclick: function () {
+          edg.value = !edg.value;
+        }
+      }
+    ]
+  };
+
+  myChartOne.setOption(optionOne);
 };
 let socket4 = null;
 const hollowBigStorageCageUsage = ref([])
 const socketUrl4 = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/largenScreen`;
 const handleMessage4 = (data) => {
   hollowBigStorageCageUsage.value = data.hollowBigStorageCageUsage[0];
+  const pieChartVOS = ref([]);
+  pieChartVOS.value = data.pieChartVOS[0];
+  let oneFinish = ref();
+  let twoFinish = ref();
+  let oneunFinish = ref();
+  let twounFinish = ref();
+  if (hollow.value) {
+    oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
+    twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
+    oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+    twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+  } else {
+    oneFinish = pieChartVOS.value[0].oneCompletedArea;
+    twoFinish = pieChartVOS.value[0].twoCompletedArea;
+    oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+    twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+  }
+
+  const chartDomOne = chartFour.value;
+  if (!chartDomOne) {
+    console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+    return;
+  }
+  const myChartOne = echarts.init(chartDomOne);
+  const optionOne = {
+    title: {
+      text: t('large.hollow'),
+      subtext: '',
+      left: 'right'
+    },
+    tooltip: {
+      trigger: 'item'
+    },
+    legend: {
+      orient: 'vertical',
+      left: 'left'
+    },
+    series: [
+      {
+        name: '',
+        type: 'pie',
+        radius: '50%',
+        data: [
+          { value: oneFinish, name: t('large.oneFinish') },
+          { value: twoFinish, name: t('large.twoFinish') },
+          { value: oneunFinish, name: t('large.oneunFinish') },
+          { value: twounFinish, name: t('large.twounFinish') },
+        ],
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ],
+    graphic: [
+      {
+        type: 'rect',
+        left: 'center',
+        top: 0,
+        shape: {
+          width: 80,
+          height: 30
+        },
+        style: {
+          text: hollow.value == true ? t('large.quantity') : t('large.are'),
+          fill: '#5470C6',
+          stroke: '#000',
+          lineWidth: 1
+        },
+        onclick: function () {
+          hollow.value = !hollow.value;
+        }
+      }
+    ]
+  };
+
+  myChartOne.setOption(optionOne);
 };
 let socket5 = null;
 const productionVO = ref([])
 const socketUrl5 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreenProduction`;
 const handleMessage5 = (data) => {
-  productionVO.value = data.productionVO;
+  productionVO.value = data.productionVO[0];
+  // 灏嗗師濮嬫暟鎹浆鎹负 ECharts 鍥捐〃鎵�闇�鏍煎紡
+  categories = productionVO.value.map(item => item.date); // 鑾峰彇鏃ユ湡浣滀负 x 杞�
+  totalAreaOutOne = productionVO.value.map(item => item.totalAreaOutOne);
+  countIn = productionVO.value.map(item => item.countIn);
+  totalAreaOutTwo = productionVO.value.map(item => item.totalAreaOutTwo);
+  totalAreaOut = productionVO.value.map(item => item.totalAreaOut);
+  countOut = productionVO.value.map(item => item.countOut);
+  hollowTotalAreaOutTwo = productionVO.value.map(item => item.hollowTotalAreaOutTwo);
+  hollowCountOutOne = productionVO.value.map(item => item.hollowCountOutOne);
+  countOutTwo = productionVO.value.map(item => item.countOutTwo);
+  hollowCountOutTwo = productionVO.value.map(item => item.hollowCountOutTwo);
+  hollowTotalAreaOutOne = productionVO.value.map(item => item.hollowTotalAreaOutOne);
+  totalAreaIn = productionVO.value.map(item => item.totalAreaIn);
+  countOutOne = productionVO.value.map(item => item.countOutOne);
+  //鍥捐〃
+  nextTick() // 纭繚 DOM 鍔犺浇瀹屾垚
+  const chartDom = chartRef.value;
+  if (!chartDom) {
+    console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+    return;
+  }
+
+  const myChart = echarts.init(chartDom);
+
+
+  const option = {
+    title: { text: '' },
+    tooltip: { trigger: 'axis' },
+    legend: {
+      data: [
+        t('large.countOutOne'),
+        t('large.totalAreaOutOne'),
+        t('large.countOutTwo'),
+        t('large.totalAreaOutTwo'),
+        t('large.countIn'),
+        t('large.totalAreaIn')
+      ]
+    },
+    grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+    toolbox: { feature: { saveAsImage: {} } },
+    xAxis: {
+      type: 'category',
+      boundaryGap: false,
+      data: categories // 杩欐槸鏃ユ湡鏁版嵁
+    },
+    yAxis: { type: 'value' },
+    series: [
+      { name: t('large.countOutOne'), type: 'bar', data: countOutOne },
+      { name: t('large.totalAreaOutOne'), type: 'bar', data: totalAreaOutOne },
+      { name: t('large.countOutTwo'), type: 'bar', data: countOutTwo },
+      { name: t('large.totalAreaOutTwo'), type: 'bar', data: totalAreaOutTwo },
+      { name: t('large.countIn'), type: 'bar', data: countIn },
+      { name: t('large.totalAreaIn'), type: 'bar', data: totalAreaIn }
+    ]
+  };
+
+  myChart.setOption(option);
+
+  const chartDom2 = chartRef2.value;
+  if (!chartDom2) {
+    console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+    return;
+  }
+  const myChart2 = echarts.init(chartDom2);
+  const option2 = {
+    title: { text: '' },
+    tooltip: { trigger: 'axis' },
+    legend: {
+      data: [
+        t('large.totalAreaOut'),
+        t('large.countOut'),
+        t('large.hollowTotalAreaOutOne'),
+        t('large.hollowCountOutOne'),
+        t('large.hollowCountOutTwo'),
+        t('large.hollowTotalAreaOutTwo')
+      ]
+    },
+    grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+    toolbox: { feature: { saveAsImage: {} } },
+    xAxis: {
+      type: 'category',
+      boundaryGap: false,
+      data: categories // 杩欐槸鏃ユ湡鏁版嵁
+    },
+    yAxis: { type: 'value' },
+    series: [
+      { name: t('large.totalAreaOut'), type: 'bar', data: totalAreaOut },
+      { name: t('large.countOut'), type: 'bar', data: countOut },
+      { name: t('large.hollowTotalAreaOutOne'), type: 'bar', data: hollowTotalAreaOutOne },
+      { name: t('large.hollowCountOutOne'), type: 'bar', data: hollowCountOutOne },
+      { name: t('large.hollowCountOutTwo'), type: 'bar', data: hollowCountOutTwo },
+      { name: t('large.hollowTotalAreaOutTwo'), type: 'bar', data: hollowTotalAreaOutTwo }
+    ]
+  };
+
+  myChart2.setOption(option2);
 };
+// 灏嗗師濮嬫暟鎹浆鎹负 ECharts 鍥捐〃鎵�闇�鏍煎紡
+let categories = ref([]); // 鑾峰彇鏃ユ湡浣滀负 x 杞�
+let totalAreaOutOne = ref([]);
+let countIn = ref([]);
+let totalAreaOutTwo = ref([]);
+let totalAreaOut = ref([]);
+let countOut = ref([]);
+let hollowTotalAreaOutTwo = ref([]);
+let hollowCountOutOne = ref([]);
+let countOutTwo = ref([]);
+let hollowCountOutTwo = ref([]);
+let hollowTotalAreaOutOne = ref([]);
+let totalAreaIn = ref([]);
+let countOutOne = ref([]);
 
 const tableDatad = ref([]);
 const patternUsage = async () => {
@@ -148,8 +577,17 @@
   blindb.value = true;
   patternUsage()
 };
+const chartRef = ref(null)
+const chartRef2 = ref(null)
+const chartOne = ref(null)
+const chartTwo = ref(null)
+const chartThree = ref(null)
+const chartFour = ref(null)
+
+
 // 鍦ㄧ粍浠舵寕杞芥椂璁剧疆榛樿鏃堕棿鑼冨洿
-onMounted(() => {
+onMounted(async () => {
+
   boxStart();
   boxStart2();
   boxStart3();
@@ -165,6 +603,7 @@
   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')];
+
 });
 // onMounted(() => {
 //   socket = initializeWebSocket(socketUrl, handleMessage);
@@ -187,13 +626,13 @@
 const numBoxes3 = ref(5);
 const numBoxes4 = ref(1);
 const speed = 0.1;
-const maxX = 250; // 缁堢偣X鍧愭爣
-const maxY = -90; // 缁堢偣Y鍧愭爣
+const maxX = 200; // 缁堢偣X鍧愭爣
+const maxY = -75; // 缁堢偣Y鍧愭爣
 const maxX2 = 313; // 缁堢偣X鍧愭爣
-const maxY2 = -204; // 缁堢偣Y鍧愭爣
-const maxX3 = 125; // 缁堢偣X鍧愭爣
-const maxY3 = -105; // 缁堢偣Y鍧愭爣
-const maxX4 = 80; // 缁堢偣X鍧愭爣
+const maxY2 = -165; // 缁堢偣Y鍧愭爣
+const maxX3 = 95; // 缁堢偣X鍧愭爣
+const maxY3 = -85; // 缁堢偣Y鍧愭爣
+const maxX4 = 60; // 缁堢偣X鍧愭爣
 const maxY4 = 0; // 缁堢偣Y鍧愭爣
 const delayFrames = 600; // 姣忎釜 div 鐨勫欢杩熷抚鏁�
 const boxes = ref([]);
@@ -455,179 +894,224 @@
   hollowTotalAreaOutTwo: t('large.hollowTotalAreaOutTwo'),
 };
 
+
 </script>
 <template>
   <div style="height: 500px;">
-    <el-dialog v-model="iframe1" top="5vh" width="95%" @close="iframeUrl1=''">
+    <el-dialog v-model="iframe1" top="5vh" width="95%" @close="iframeUrl1 = ''">
       <iframe :src="iframeUrl1" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe2" top="5vh" width="95%" @close="iframeUrl2=''">
+    <el-dialog v-model="iframe2" top="5vh" width="95%" @close="iframeUrl2 = ''">
       <iframe :src="iframeUrl2" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe3" top="5vh" width="95%" @close="iframeUrl3=''">
+    <el-dialog v-model="iframe3" top="5vh" width="95%" @close="iframeUrl3 = ''">
       <iframe :src="iframeUrl3" marginwidth="2000px" marginheight="2000px" width="100%" height="700"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe4" top="5vh" width="95%" @close="iframeUrl4=''">
+    <el-dialog v-model="iframe4" top="5vh" width="95%" @close="iframeUrl4 = ''">
       <iframe :src="iframeUrl4" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe5" top="5vh" width="95%" @close="iframeUrl5=''">
+    <el-dialog v-model="iframe5" top="5vh" width="95%" @close="iframeUrl5 = ''">
       <iframe :src="iframeUrl5" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe6" top="5vh" width="95%" @close="iframeUrl6=''">
+    <el-dialog v-model="iframe6" top="5vh" width="95%" @close="iframeUrl6 = ''">
       <iframe :src="iframeUrl6" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe7" top="5vh" width="95%" @close="iframeUrl7=''">
+    <el-dialog v-model="iframe7" top="5vh" width="95%" @close="iframeUrl7 = ''">
       <iframe :src="iframeUrl7" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe8" top="5vh" width="95%" @close="iframeUrl8=''">
+    <el-dialog v-model="iframe8" top="5vh" width="95%" @close="iframeUrl8 = ''">
       <iframe :src="iframeUrl8" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe9" top="5vh" width="95%" @close="iframeUrl9=''">
+    <el-dialog v-model="iframe9" top="5vh" width="95%" @close="iframeUrl9 = ''">
       <iframe :src="iframeUrl9" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
         frameborder="0"></iframe>
     </el-dialog>
-    <el-dialog v-model="iframe10" top="5vh" width="95%" @close="iframeUrl10=''">
+    <el-dialog v-model="iframe10" top="5vh" width="95%" @close="iframeUrl10 = ''">
       <iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
         frameborder="0"></iframe>
     </el-dialog>
 
     <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="primary"
-            @click="handlehistorical1">{{
-              $t('large.historicaltasks1') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="blindc=true">{{
-              $t('large.order') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="handlehistorical2">{{
-              $t('large.historicaltasks2') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="handlehistorical3">{{
-              $t('large.historicaltasks3') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="handlehistorical4">{{
-              $t('large.historicaltasks4') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="handlehistorical5">{{
-              $t('large.historicaltasks5') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="handlehistorical7">{{
-              $t('large.historicaltasks7') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="handlehistorical8">{{
-              $t('large.historicaltasks8') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="handlehistorical6">{{
-              $t('large.historicaltasks6') }}</el-button>
-          <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="primary"
-            @click="handlehistorical9">{{
-              $t('large.historicaltasks9') }}</el-button>
+      <div style="height: 100px;width: 25%;float: right;">
+        <div id="ss" style="width: 100%; display: flex; justify-content: center;">
+          <div ref="chartRef" style="width: 600px; height: 400px;"></div>
+        </div>
+        <div style="width: 100%;height: 245px;display: flex;">
+          <div ref="chartOne" style="width: 100%;"></div>
+        </div>
+        <div style="width: 100%;height: 245px;display: flex;">
+          <div ref="chartTwo" style="width: 100%;"></div>
         </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: 66px;height: 28px;top: 355px;left: 284px;position: absolute;background-color: #911005;"></div>
-        <div v-if="temperingGlassInfoList > 1" class="tempering"
-          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: 59px;height: 29px;top: 629px;left: 562px;position: absolute;background-color: #911005;"></div>
-        <div v-if="engineeringTwo.length > 1" class="slicing"
-          style="width: 59px;height: 29px;top: 692px;left: 562px;position: absolute;background-color: #911005;"></div>
-        <!-- 鍘熺墖浠撳偍鑹插潡 -->
-        <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: 5.6px;background-color: #911005;"'></div>
+      <div style="width: 50%;">
+        <div class="img-screen" alt="Screen">
+          <!-- 閽㈠寲鍗婇�忔槑鑹插潡 -->
+          <div style="width: 80px;height: 40px;top: 130px;left: 130px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+            <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOut : 0 }}鐗�</div>
+            <div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOut : 0 }}m虏</div>
+          </div>
+          <!-- 涓┖涓�绾垮崐閫忔槑鑹插潡 -->
+          <div style="width: 80px;height: 40px;top: 315px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+            <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].hollowCountOutOne : 0 }}鐗�</div>
+            <div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].hollowTotalAreaOutOne : 0 }}m虏</div>
+          </div>
+          <!-- 涓┖浜岀嚎鍗婇�忔槑鑹插潡 -->
+          <div style="width: 80px;height: 40px;top: 230px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+            <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].hollowCountOutTwo : 0 }}鐗�</div>
+            <div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].hollowTotalAreaOutTwo : 0 }}m虏</div>
+          </div>
+          <!-- 鍒囧壊浜岀嚎鍗婇�忔槑鑹插潡 -->
+          <div style="width: 80px;height: 40px;top: 542px;left: 410px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+            <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}鐗�</div>
+            <div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutOne : 0 }}m虏</div>
+          </div>
+          <!-- 鍒囧壊涓�绾垮崐閫忔槑鑹插潡 -->
+          <div style="width: 80px;height: 40px;top: 490px;left: 410px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+            <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}鐗�</div>
+            <div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutTwo : 0 }}m虏</div>
+          </div>
+          <!-- 纾ㄨ竟涓�绾垮崐閫忔槑鑹插潡 -->
+          <div style="width: 80px;height: 40px;top: 410px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+            <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}鐗�</div>
+            <div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutOne : 0 }}m虏</div>
+          </div>
+          <!-- 纾ㄨ竟浜岀嚎鍗婇�忔槑鑹插潡 -->
+          <div style="width: 80px;height: 40px;top: 369px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+            <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}鐗�</div>
+            <div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutTwo : 0 }}m虏</div>
+          </div>
+          <!-- 閽㈠寲鍓嶅ぇ鐞嗙墖鍗婇�忔槑鑹插潡 -->
+          <div style="width: 80px;height: 40px;top: 380px;left: 290px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+            <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countIn : 0 }}鐗�</div>
+            <div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaIn : 0 }}m虏</div>
+          </div>
+          
+          <!-- 閽㈠寲鑹插潡 -->
+          <div v-if="temperingGlassInfoInList > 0" class="tempering"
+            style="width: 44px;height: 19px;top: 284px;left: 178px;position: absolute;background-color: #911005;"></div>
+          <div v-if="temperingGlassInfoList > 0" class="tempering"
+            style="width: 53px;height: 22px;top: 282px;left: 226px;position: absolute;background-color: #911005;"></div>
+          <div v-if="temperingGlassInfoList > 1" class="tempering"
+            style="width: 53px;height: 22px;top: 282px;left: 282px;position: absolute;background-color: #911005;"></div>
+          <!-- 鍒囧壊鍙拌壊鍧� -->
+          <div v-if="engineeringOne.length > 1" class="slicing"
+            style="width: 45px;height: 20px;top: 500px;left: 496px;position: absolute;background-color: #911005;"></div>
+          <div v-if="engineeringTwo.length > 1" class="slicing"
+            style="width: 45px;height: 20px;top: 550px;left: 496px;position: absolute;background-color: #911005;"></div>
+          <!-- 鍘熺墖浠撳偍鑹插潡 -->
+          <div class="raw" style="width: 27px;height: 30px;top: 497px;left: 296px;position: absolute;">
+            <div v-for="(item, index) in rawGlassStorageDetailList.slice(0, 7)" :key="index"
+              :style='"width: " + (item.remainQuantity / 1.8) + "px;height: 5.6px;background-color: #911005;"'></div>
+          </div>
+          <div class="raw" style="width: 27px;height: 45px;top: 535px;left: 296px;position: absolute;">
+            <div v-for="(item, index) in rawGlassStorageDetailList.slice(8, 17)" :key="index"
+              :style='"width: " + (item.remainQuantity / 1.8) + "px;height: 5.6px;background-color: #911005;"'></div>
+          </div>
+          <div class="raw" style="width: 27px;height: 13px;top: 598px;left: 296px;position: absolute;">
+            <div v-for="(item, index) in rawGlassStorageDetailList.slice(18, 20)" :key="index"
+              :style='"width: " + (item.remainQuantity / 1.8) + "px;height: 5.6px;background-color: #911005;"'></div>
+          </div>
+          <div class="raw" style="width: 27px;height: 23px;top: 580px;left: 365px;position: absolute;">
+            <div v-for="(item, index) in rawGlassStorageDetailList.slice(21, 25)" :key="index"
+              :style='"width: " + (item.remainQuantity / 1.8) + "px;height: 5.6px;background-color: #911005;"'></div>
+          </div>
+          <!-- <div class="raw" style="width: 27px;height: 12px;top: 611px;left: 459px;position: absolute;">
+            <div v-for="(item, index) in rawGlassStorageDetailList.slice(26, 27)" :key="index"
+              :style='"width: " + (item.remainQuantity / 1.8) + "px;height: 5.6px;background-color: #911005;"'></div>
+          </div>
+          <div class="raw" style="width: 27px;height: 12px;top: 6676px;left: 459px;position: absolute;">
+            <div v-for="(item, index) in rawGlassStorageDetailList.slice(28, 29)" :key="index"
+              :style='"width: " + (item.remainQuantity / 1.8) + "px;height: 5.6px;background-color: #911005;"'></div>
+          </div> -->
+          <!-- 纾ㄨ竟鑹插潡 -->
+          <div class="container"
+            style="position: relative;width: 15px;height: 15px;top: 500px;left: 638px;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: 15px;height: 15px;top: 548px;left: 690px;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: 15px;height: 15px;top: 370px;left: 195px;position: absolute;background-color: red;">
+            <div v-for="(box, index) in boxes3" :key="index" class="box" :style="box.style"></div>
+          </div>
+          <div class="container"
+            style="position: relative;width: 15px;height: 15px;top: 284px;left: 489px;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: " + (37 * item.percentage / 100) + "px;height: 13px;top: 374px;left: 309px;position: absolute;background-color: #911005;"'>
+          </div>
+          <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(1, 2)" :key="index"
+            :style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 390px;left: 309px;position: absolute;background-color: #911005;"'>
+          </div>
+          <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(2, 3)" :key="index"
+            :style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 406px;left: 309px;position: absolute;background-color: #911005;"'>
+          </div>
+          <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(3, 4)" :key="index"
+            :style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 422px;left: 309px;position: absolute;background-color: #911005;"'>
+          </div>
+          <!-- 涓┖鍓嶅ぇ鐞嗙墖鑹插潡 -->
+          <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(0, 1)" :key="index"
+            :style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 265px;left: 662px;position: absolute;background-color: #911005;"'>
+          </div>
+          <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(1, 2)" :key="index"
+            :style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 281px;left: 662px;position: absolute;background-color: #911005;"'>
+          </div>
+          <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(2, 3)" :key="index"
+            :style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 297px;left: 662px;position: absolute;background-color: #911005;"'>
+          </div>
+          <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(3, 4)" :key="index"
+            :style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 313px;left: 662px;position: absolute;background-color: #911005;"'>
+          </div>
+          <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(4, 5)" :key="index"
+            :style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 329px;left: 662px;position: absolute;background-color: #911005;"'>
+          </div>
+          <div class="clickable-area" @click="handlehistorical"
+            style="position: relative;width: 108px;height: 134px;top: 478px;left: 290px;"></div>
         </div>
-        <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: 5.6px;background-color: #911005;"'></div>
+        <div style="height: 190px;width: 100%;float: right;">
+          <el-table height="190" 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 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: 5.6px;background-color: #911005;"'></div>
+      </div>
+
+      <div style="height: 100px;width: 25%;float: right;">
+        <div id="ss" style="width: 100%; display: flex; justify-content: center;">
+          <div ref="chartRef2" style="width: 600px; height: 400px;"></div>
         </div>
-        <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: 5.6px;background-color: #911005;"'></div>
+        <div style="width: 100%;height: 245px;display: flex;">
+          <div ref="chartThree" style="width: 100%;"></div>
         </div>
-        <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: 5.6px;background-color: #911005;"'></div>
+        <div style="width: 100%;height: 245px;display: flex;">
+          <div ref="chartFour" style="width: 100%;"></div>
         </div>
-        <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: 5.6px;background-color: #911005;"'></div>
-        </div>
-        <!-- 纾ㄨ竟鑹插潡 -->
-        <div class="container"
-          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: 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: 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: 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: " + (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: " + (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: " + (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: " + (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: " + (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: " + (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: " + (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: " + (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: " + (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>
   </div>
@@ -740,8 +1224,8 @@
   /* float: left; */
   position: relative;
   background-image: url('../../assets/screen.png');
-  width: 1002px;
-  height: 878px;
+  width: 795px;
+  height: 700px;
   background-size: contain;
   background-repeat: no-repeat;
   /* background-position: center; */

--
Gitblit v1.8.0