From 1195e51e67436cf2b9513678b5e9d3f27a043de4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 十二月 2025 08:29:40 +0800
Subject: [PATCH] 1、中空选中除膜改为多选 2、流程卡报工情况查询添加工程号条件,添加线路,备注显示

---
 UI-Project/src/views/hollow/hollowslicecage.vue | 1700 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 1,074 insertions(+), 626 deletions(-)

diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index df6d7bc..8ff20e5 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -1,15 +1,15 @@
 <script lang="ts" setup>
-import {useI18n} from 'vue-i18n'
-import {useRouter} from "vue-router"
+import { useI18n } from 'vue-i18n'
+import { useRouter } from "vue-router"
 import request from "@/utils/request"
 import {host, WebSocketHost} from '@/utils/constants'
 import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
 import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
 import {ElMessage, ElMessageBox} from 'element-plus'
-
+import LackDetailDialog from './LackDetailDialog.vue';
 const dialogFormVisibleaDownGlasss = ref(false)
 const scanGlass = ref([])
-const {t} = useI18n()
+const { t } = useI18n()
 let language = ref(localStorage.getItem('lang') || 'zh')
 const router = useRouter()
 const dialogFormVisiblea = ref(false)
@@ -20,6 +20,7 @@
 const outRequestEntity = ref('#911005');
 const freeone = ref('#911005');
 const freetwo = ref('#911005');
+const freethree = ref('#911005');
 const tableDataa = ref([])
 const tableDatab = ref([])
 const tableDatac = ref([])
@@ -27,10 +28,26 @@
 const tableDataf = ref([])
 const tableDatae = ref([])
 const carPosition = ref([])
+const tableDatass = ref([])
+const tableDataLack = ref([])
+const tableDataMiss = ref([])
+// 鍝嶅簲寮忕姸鎬�
+const showAlert = ref(false)
+const alertMessage = ref('')
+const alarmData = ref<any>(null)
+const showModal = ref(false)
+const currentAlarm = ref<any>(null)
+const tableDataAlert = ref([])
+const alertText = ref('')
+const engineerId = ref('')
 const ganghua = ref('')
 const diaodu = ref('')
+const hollowPriority = ref('')
 const flowCardId = ref('')
+const glassType = ref('')
+const layer = ref('')
 const filmsId = ref('')
+const thickness = ref('')
 const adjust = ref([]);
 const adjusta = ref([]);
 const adjustedRects = ref([]);
@@ -38,45 +55,131 @@
 const adjustedRectsb = ref([]);
 const adjustedRectsc = ref([]);
 const adjustedRectsd = ref([]);
+const adjustedRectse = ref([]);
 const subRectsCounts = ref([]);
 const subRectsCountsa = ref([]);
 const subRectsCountsb = ref([]);
 const subRectsCountsc = ref([]);
 const subRectsCountsd = ref([]);
+const subRectsCountse = ref([]);
 const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁 
+const currentLack = reactive({});
 const currentPage2 = ref(1)
 const add = ref(false)
 const glassId = ref('');
-const cell1=ref(true);
-const cell2=ref(true);
-const cell3=ref(true);
-const cell4=ref(true);
-const cell5=ref(true);
-const cell6=ref(true);
-const cell7=ref(true);
-const cell8=ref(true);
-const cell9=ref(true);
+const cell1 = ref(true);
+const cell2 = ref(true);
+const cell3 = ref(true);
+const cell4 = ref(true);
+const cell5 = ref(true);
+const cell6 = ref(true);
+const cell7 = ref(true);
+const cell8 = ref(true);
+const cell9 = ref(true);
+const blindb = ref(false)
+const dialogFormVisibleb = ref(false)
+const dialogFormVisibleLack = ref(false)
 const selectedRow = ref(null);
 const temperingengineerId=ref('');
-const handlePageChange2 = (newPage) => {
-  currentPage2.value = newPage;
-  console.log(currentPage2.value);
-  window.localStorage.setItem('pagenumber', currentPage2.value)
-  fetchxiang(currentPage2.value);
+function nestedTableRowClassName(parentRow, row) {
+  if (parentRow.isThroughSlot == true) {
+    return 'row-red-background';
+  }
+  if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
+    return 'sum-equal-pair-row' // 杩斿洖鑷畾涔夌被鍚�
+  }
+  return '';
+}
+// 缂虹墖璇︽儏
+const handleSliceRack = (row) => {
+  currentRow.flowCardId = row.flowCardId;
+  dialogFormVisibleLack.value = true;
 };
 const handleBindRack = (row) => {
   selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁  
-  currentRow.deviceId  = row.deviceId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�  
-  currentRow.slot = row.slot;  
+  currentRow.deviceId = row.deviceId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�
+  currentRow.slot = row.slot;
   window.localStorage.setItem('deviceId', row.deviceId)
   window.localStorage.setItem('slot', row.slot)
   add.value = true;
 };
+// 澶氭潯鐮存崯鏁版嵁
+const handleMissingFilms = (row) => {
+  dialogFormVisibleb.value = true;
+  handleAllMissing(row)
+};
+const handleAllMissing = async (row) => {
+  try {
+    const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryLackGlassByFlowCard', {
+      flowCardId: row.flowCardId,
+      layer: row.layer,
+      orderSort: row.glassType,
+      //  glassId: row.glassId
+    });
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      tableDataMiss.value = response.data
+    } else {
+      ElMessage.error(response.message);
+    }
+  }
+  catch (error) {
+  }
+}
+const handlePageChange2 = (newPage) => {
+  currentPage2.value = newPage;
+  fetchFlowBind(currentLack.flowCardId, currentPage2.value);
+};
+const fetchFlowBind = async (flowCardId, page) => {
+  try {
+    var url = "/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId=" + flowCardId + "&layer=" + 1;
+    const response = await request.post(url)
+    if (response.code == 200) {
+      tableDataLack.value = response.data[page];
+      ElMessage.success(response.message);
+    } else {
+    }
+  } catch (error) {
+  }
+}
+// 璁$畻鍚堣琛岀殑鏂规硶
+const getSummaries = (param) => {
+  const { columns, data } = param;
+  const sums: string[] = [];
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = '鍚堣';
+      return;
+    }
+    // 鍙闇�瑕佽绠楃殑鍒楄繘琛屾眰鍜�
+    const needSumColumns = ['sumCount', 'pairCount', 'totalNumber', 'realCount'];
+    if (needSumColumns.includes(column.property)) {
+      const values = data.map(item => Number(item[column.property]));
+      if (!values.every(value => isNaN(value))) {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return prev + curr;
+          } else {
+            return prev;
+          }
+        }, 0);
+        sums[index] += ''; // 杞负瀛楃涓�
+      } else {
+        sums[index] = 'N/A';
+      }
+    } else {
+      sums[index] = '';
+    }
+  });
+
+  return sums;
+};
 // 鎼滅储
 const searchout = async () => {
   try {
-    const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectBigStorageCageDetails',{
-      glassId:glassId.value
+    const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectBigStorageCageDetails', {
+      glassId: glassId.value
     });
     if (response.code == 200) {
       tableDataf.value = response.data;
@@ -85,33 +188,32 @@
       ElMessage.error(response.message);
     }
   } catch (error) {
-    console.error(error);
   }
 };
 // 鏄惁绂佺敤
 const toggleEnableState = async (row) => {
-  const newState = row.enableState === 1 ? 0 : 1;  
-  var url="/cacheVerticalGlass/bigStorageCage/updateStorageCageDisabled?slot="+row.slot + "&enableState=" + newState;
-      const response = await request.get(url) 
+  const newState = row.enableState === 1 ? 0 : 1;
+  var url = "/hollowGlass/hollowBigStorageCageDetails/updateHollowStorageCageDisabled?slot=" + row.slot + "&enableState=" + newState;
+  const response = await request.get(url)
   if (response.code === 200) {
-      ElMessage.success(response.message);
-      } else {  
-      ElMessage.error(response.message);
-      }  
-  row.enableState = newState;  
-}; 
- // 鍒犻櫎 
- const opena = async(row) => {  
+    ElMessage.success(response.message);
+  } else {
+    ElMessage.error(response.message);
+  }
+  row.enableState = newState;
+};
+// 鍒犻櫎
+const opena = async (row) => {
   try {
-    const confirmResult = await ElMessageBox.confirm(  
-      t('searchOrder.deletemessage'), 
-      t('searchOrder.prompt'),  
-      {  
-        confirmButtonText: t('searchOrder.yes'), 
+    const confirmResult = await ElMessageBox.confirm(
+      t('searchOrder.deletemessage'),
+      t('searchOrder.prompt'),
+      {
+        confirmButtonText: t('searchOrder.yes'),
         cancelButtonText: t('searchOrder.cancel'),
-        type: 'warning',  
-      } 
-    ); 
+        type: 'warning',
+      }
+    );
     if (confirmResult === 'confirm') {
       const params = new URLSearchParams();
       params.append('state', '8');
@@ -120,30 +222,94 @@
       params.append('slot', row.slot);
       var url = `/hollowGlass/hollowBigStorageCageDetails/deleteHollowBigStorageCageDetails?${params.toString()}`;
       const response = await request.post(url)
-    if (response.code === 200) {
-       fetchxiang(1);
-      //  tableDataa.value = response.data;
-     ElMessage.success(response.message);
+      if (response.code === 200) {
+        fetchxiang();
+        //  tableDataa.value = response.data;
+        ElMessage.success(response.message);
       } else {
-      ElMessage.error(response.message);
-      }  
-    }  
+        ElMessage.error(response.message);
+      }
+    }
   } catch (error) {
-    console.error('鍙戠敓閿欒:', error);  
-  }  
-}; 
- // 鐮存崯
- const broke = async(row) => {  
+  }
+};
+// 缂虹墖璇︽儏-鐮存崯
+const handleBroke = async (row) => {
   try {
-    const confirmResult = await ElMessageBox.confirm(  
-      t('searchOrder.broke'), 
-      t('searchOrder.prompt'),  
-      {  
-        confirmButtonText: t('searchOrder.yes'), 
+    const confirmResult = await ElMessageBox.confirm(
+      t('searchOrder.broke'),
+      t('workOrder.prompt'),
+      {
+        confirmButtonText: t('workOrder.yes'),
+        cancelButtonText: t('workOrder.cancel'),
+        type: 'warning',
+      }
+    );
+    const response = await request.post('/hollowGlass/hollowGlassRelationInfo/hollowBigStorageGlassDamage', {
+      flowCardId: row.flowCardId,
+      glassType: row.glassType,
+      glassId: row.glassId,
+      layer: row.layer,
+      state: 8,
+      line: 1,
+      workingProcedure: '涓┖',
+      remark: '涓┖'
+    })
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      const { flowCardId } = row;
+      fetchFlowBind(flowCardId, currentPage2.value);
+    } else {
+      ElMessage.error(response.msg);
+    }
+  } catch (error) {
+    console.error(error);
+  }
+}
+// 缂虹墖璇︽儏-涓�閿牬鎹�
+const handleAllBroke = async (row) => {
+  try {
+    const confirmResult = await ElMessageBox.confirm(
+      t('order.dilapidationWhether'),
+      t('workOrder.prompt'),
+      {
+        confirmButtonText: t('workOrder.yes'),
+        cancelButtonText: t('workOrder.cancel'),
+        type: 'warning',
+      }
+    );
+    const response = await request.post('/hollowGlass/hollowGlassRelationInfo/hollowBigStorageGlassDamage', {
+      flowCardId: row.flowCardId,
+      glassType: row.glassType,
+      layer: row.layer,
+      state: 8,
+      line: 1,
+      workingProcedure: '涓┖',
+      remark: '涓┖'
+    })
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      const { flowCardId } = row;
+      fetchFlowBind(flowCardId, currentPage2.value);
+    } else {
+      ElMessage.error(response.msg);
+    }
+  } catch (error) {
+    console.error(error);
+  }
+}
+// 鐮存崯
+const broke = async (row) => {
+  try {
+    const confirmResult = await ElMessageBox.confirm(
+      t('searchOrder.broke'),
+      t('searchOrder.prompt'),
+      {
+        confirmButtonText: t('searchOrder.yes'),
         cancelButtonText: t('searchOrder.cancel'),
-        type: 'warning',  
-      } 
-    ); 
+        type: 'warning',
+      }
+    );
     if (confirmResult === 'confirm') {
       const params = new URLSearchParams();
       params.append('state', '8');
@@ -151,31 +317,30 @@
       params.append('glassId', row.glassId);
       params.append('slot', row.slot);
       var url = `/hollowGlass/hollowBigStorageCageDetails/damageHollowBigStorageCageDetails?${params.toString()}`;
-    const response = await request.post(url)
+      const response = await request.post(url)
       if (response.code === 200) {
-       fetchxiang(1); 
-     ElMessage.success(response.message);
-      } else {  
-      ElMessage.error(response.message);
-      }  
-    }  
-  } catch (error) {  
-    console.error('鍙戠敓閿欒:', error);  
-  }  
-}; 
- // 鎷胯蛋
- const brokec = async(row) => {  
+        fetchxiang();
+        ElMessage.success(response.message);
+      } else {
+        ElMessage.error(response.message);
+      }
+    }
+  } catch (error) {
+  }
+};
+// 鎷胯蛋
+const brokec = async (row) => {
   try {
-    const confirmResult = await ElMessageBox.confirm(  
-      t('searchOrder.brokeb'), 
-      t('searchOrder.prompt'),  
-      {  
-        confirmButtonText: t('searchOrder.yes'), 
+    const confirmResult = await ElMessageBox.confirm(
+      t('searchOrder.brokeb'),
+      t('searchOrder.prompt'),
+      {
+        confirmButtonText: t('searchOrder.yes'),
         cancelButtonText: t('searchOrder.cancel'),
-        type: 'warning',  
-      } 
-    ); 
-    if (confirmResult === 'confirm') {  
+        type: 'warning',
+      }
+    );
+    if (confirmResult === 'confirm') {
       const params = new URLSearchParams();
       params.append('state', '9');
       params.append('deviceId', row.deviceId);
@@ -184,120 +349,228 @@
       var url = `/hollowGlass/hollowBigStorageCageDetails/damageHollowBigStorageCageDetails?${params.toString()}`;
       const response = await request.post(url)
       if (response.code === 200) {
-       fetchxiang(1);
-       ElMessage.success(response.message);
-      } else {  
-      ElMessage.error(response.message);
-      }  
-    }  
-  } catch (error) {  
-    console.error('鍙戠敓閿欒:', error);  
-  }  
-}; 
+        fetchxiang();
+        ElMessage.success(response.message);
+      } else {
+        ElMessage.error(response.message);
+      }
+    }
+  } catch (error) {
+  }
+};
 // 纭娣诲姞
-const finisha = async(row) => {  
+const finisha = async (row) => {
   try {
-    const confirmResult = await ElMessageBox.confirm(  
-      t('searchOrder.sureadda'), 
-      t('searchOrder.prompt'),  
-      {  
-        confirmButtonText: t('searchOrder.yes'), 
+    const confirmResult = await ElMessageBox.confirm(
+      t('searchOrder.sureadda'),
+      t('searchOrder.prompt'),
+      {
+        confirmButtonText: t('searchOrder.yes'),
         cancelButtonText: t('searchOrder.cancel'),
-        type: 'warning',  
-      } 
-    ); 
-    if (confirmResult === 'confirm') {  
-    let deviceId = window.localStorage.getItem('deviceId')
-    let slot = window.localStorage.getItem('slot')
-      const dataToSend = {  
+        type: 'warning',
+      }
+    );
+    if (confirmResult === 'confirm') {
+      let deviceId = window.localStorage.getItem('deviceId')
+      let slot = window.localStorage.getItem('slot')
+      const dataToSend = {
         ...row,
         deviceId: deviceId,
         slot: slot
-      };  
+      };
       const response = await request.post("/cacheVerticalGlass/hollowBigStorageCageDetails/insertHollowBigStorageCageDetails", dataToSend)
-    if (response.code === 200) {
-      tableDataa.value = response.data;
-      add.value = false;
-      ElMessage.success(response.message);
-      glassId.value = '';
-      tableDataf.value = '';
-      } else {  
-      ElMessage.error(response.message);
-      }  
-    }  
+      if (response.code === 200) {
+        tableDataa.value = response.data;
+        add.value = false;
+        ElMessage.success(response.message);
+        glassId.value = '';
+        tableDataf.value = '';
+      } else {
+        ElMessage.error(response.message);
+      }
+    }
   } catch (error) {
-    console.error('鍙戠敓閿欒:', error);  
-  }  
-}; 
+  }
+};
+// 璀︽姤纭
+const handleSure = async (row) => {
+  try {
+    const confirmResult = await ElMessageBox.confirm(
+      t('hellow.clickmakesure'),
+      t('productStock.prompt'),
+      {
+        confirmButtonText: t('productStock.yes'),
+        cancelButtonText: t('productStock.cancel'),
+        type: 'warning',
+      }
+    );
+    if (confirmResult === 'confirm') {
+      const response = await request.post('/hollowGlass/productAlarmInfo/updateAlarmInfo', {
+        id: row.id
+      })
+      if (response.code === 200) {
+        showModal.value = false;
+        showAlert.value = false;
+
+        ElMessage.success(response.message);
+      } else {
+        ElMessage.error(response.msg);
+      }
+    }
+  } catch (error) {
+    console.error('鍙戠敓閿欒:', error);
+  }
+};
 const handlexiang = () => {
   dialogFormVisiblea.value = true;
-  fetchxiang(1); 
+  fetchxiang();
   currentPage2.value = 1;
   window.localStorage.setItem('pagenumber', currentPage2.value)
   filmsId.value = ''
   flowCardId.value = ''
 };
 // 鐞嗙墖绗间俊鎭�
-const fetchxiang = async (page) => {
-  try {     
-    const response = await request.post('/hollowGlass/hollowBigStorageCage/queryHollowBigStorageCageDetail',{
-        deviceId: page,
-        filmsId: filmsId.value,
-        flowCardId: flowCardId.value,
+const fetchxiang = async () => {
+  try {
+    const response = await request.post('/hollowGlass/hollowBigStorageCageDetails/queryVerticalSheetCageDetailsList', {
+      // deviceId: page,
+      engineerId: engineerId.value,
+      filmsId: filmsId.value,
+      flowCardId: flowCardId.value,
+      glassId: glassId.value,
+      thickness: -1,
     })
-    if (response.code === 200) {  
+    if (response.code === 200) {
       ElMessage.success(response.message);
       tableDataa.value = response.data
-    } else {  
+    } else {
       ElMessage.warning(response.msg)
-    }  
+    }
   } catch (error) {
-  } 
+  }
 }
 const fetchxianga = async () => {
   let page = window.localStorage.getItem('pagenumber')
-  try {     
-    const response = await request.post('/hollowGlass/hollowBigStorageCage/queryHollowBigStorageCageDetail',{
-        deviceId: page,
-        filmsId: filmsId.value,
-        flowCardId: flowCardId.value,
+  try {
+    const response = await request.post('/hollowGlass/hollowBigStorageCageDetails/queryVerticalSheetCageDetailsList', {
+      deviceId: page,
+      engineerId: engineerId.value,
+      filmsId: filmsId.value,
+      flowCardId: flowCardId.value,
+      glassId: glassId.value,
+      thickness: thickness.value ? thickness.value : -1,
     })
-    if (response.code === 200) {  
+    if (response.code === 200) {
       ElMessage.success(response.message);
       tableDataa.value = response.data
       filmsId.value = ''
       flowCardId.value = ''
-    } else {  
+    } else {
       ElMessage.warning(response.msg)
-    }  
+    }
   } catch (error) {
-  } 
+  }
 }
-function handleRowClick(row) {  
+function handleRowClick(row) {
   selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁  
 }
+// 浠诲姟閲嶇疆
+// const handleptask = async() => { 
+//   try {
+//     const confirmResult = await ElMessageBox.confirm(  
+//       t('searchOrder.partasks'), 
+//       t('workOrder.prompt'),  
+//       {  
+//         confirmButtonText: t('workOrder.yes'), 
+//         cancelButtonText: t('workOrder.cancel'),
+//         type: 'warning',  
+//       } 
+//     );
+//  if (confirmResult === 'confirm') {
+//   const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
+//     if (response.code === 200) {
+//       ElMessage.success(response.message);
+//       } else {
+//       ElMessage.error(response.msg);
+//       }  
+//     }  
+//   } catch (error) {
+//   }  
+// }; 
 // 璋冨害寮�鍏�
 const handlediaodu = async () => {
-  try  {
-    const body = {  
+  try {
+    const body = {
       flag: diaodu.value,
     };
-    var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+diaodu.value;
-  const response = await request.post(url)
+    var url = "/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag=" + diaodu.value;
+    const response = await request.post(url)
     if (response.code == 200) {
       ElMessage.success(response.message);
       diaodu.value = response.data
-    }else {  
+    } else {
       ElMessage.error(response.message);
-      }  
+    }
+  }
+  catch (error) {
+  }
 }
-catch (error) {
-    console.error(error);
+// 涓┖浼樺厛绾у紑鍏�
+const handlehollowPriority = async () => {
+  try {
+    const body = {
+      flag: hollowPriority.value,
+    };
+    var url = "/hollowGlass/hollowGlassOutRelationInfo/priorityHollowSwitch?flag=" + hollowPriority.value;
+    const response = await request.post(url)
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      hollowPriority.value = response.data
+    } else {
+      ElMessage.error(response.message);
+    }
+  }
+  catch (error) {
   }
 }
 let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/hollowGlassMessage`;
 const handleMessage = (data) => {
+  // 鎶ヨ淇℃伅
+  if (data.alarmInfo[0] != null && data.alarmInfo[0].length > 0) {
+    const alert = data.alarmInfo[0];
+    const { id, alarmMessage, ...rest } = alert[0];
+    alertMessage.value = `${alarmMessage}`;
+    alertMessage.value = `${alert[0].alarmMessage}`;
+    if (alert[0].alarmCode === 'sizeSame') {
+      alertText.value = t('hellow.sizeSame');
+    } else if (alert[0].alarmCode === 'idSame') {
+      alertText.value = t('hellow.idSame');
+    } else if (alert[0].alarmCode === 'slotLess') {
+      alertText.value = t('hellow.slotLess');
+    } else if (alert[0].alarmCode === 'overSize') {
+      alertText.value = t('hellow.overSize');
+    } else if (alert[0].alarmCode === 'noGlass') {
+      alertText.value = t('hellow.noGlass');
+    } else {
+      alertText.value = t('hellow.unknownAlert');
+    }
+    alarmData.value = data; // 瀛樺偍瀹屾暣鏁版嵁鐢ㄤ簬寮圭獥
+    showAlert.value = true;
+  }
+  const formattedData = data.alarmInfo[0].map(record => ({
+    ...record,
+    formattedCreateTime: formatTimestamp(record.createTime),
+    alarmCode: record.alarmCode,
+    alarmMessage: record.alarmMessage
+  }));
+  tableDataAlert.value = formattedData;
+
+  if(data.HollowAllFlowCard!=null){
+    tableDatass.value = data.HollowAllFlowCard[0];
+  }else{
+    tableDatass.value = []
+  }
   if (data.inkageEntity != null) {
     inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
   }
@@ -313,21 +586,23 @@
   if (data.freeTwoRequestEntity != null) {
     freetwo.value = data.freeTwoRequestEntity[0] == true ? 'green' : '#911005';
   }
+  if (data.freeThreeRequestEntity != null) {
+    freethree.value = data.freeThreeRequestEntity[0] == true ? 'green' : '#911005';
+  }
   if (data.outRequestEntity != null) {
     outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
   }
   if (data.freeOneRequestEntity != null) {
     freeone.value = data.freeOneRequestEntity == 1 ? 'green' : '#911005';
   }
-  if(data.bigStorageCageDetailsOutTask!=null){
+  if (data.bigStorageCageDetailsOutTask != null) {
     tableDatac.value = data.bigStorageCageDetailsOutTask[0]
-    console.log(data.bigStorageCageDetailsOutTask[0])
     adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
   } else {
-    tableDatac.value = '',
-    adjusta.value = ''
+    tableDatac.value = [],
+      adjusta.value = []
   }
-    if (data.scanGlass != null) {
+  if (data.scanGlass != null) {
     scanGlass.value = data.scanGlass[0];
     let width = scanGlass.value.width;
     let height = scanGlass.value.height;
@@ -336,81 +611,76 @@
       scanGlass.value.height = width;
     }
   }
-  if(data.bigStorageCageDetailsFeedTask!=null){
+  if (data.bigStorageCageDetailsFeedTask != null) {
     tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
-    adjust.value = data.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined); 
-  }else{
-    tableDatad.value = ''
-      }
-if(data.temperingGlassInfoList!=null){
-  tableDatab.value = data.temperingGlassInfoList[0]
-  console.log(tableDatab.value)
-}else{
-    tableDatab.value = ''
-      }
-      console.log(data.bigStorageCageUsage);
-      
-if(data.bigStorageCageUsage!=null){
-  tableDatae.value = data.bigStorageCageUsage[0]
-}else{
-    tableDatae.value = ''
-      }
-if(data.carPostion!=null){
-  carPosition.value = data.carPostion[0]
-}else{
-  carPosition.value = ''
+    adjust.value = data.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+  } else {
+    tableDatad.value = []
   }
-if(data.temperingSwitch!=null){
-  ganghua.value = data.temperingSwitch[0]
-}else{
-  ganghua.value = ''
+  if (data.temperingGlassInfoList != null) {
+    tableDatab.value = data.temperingGlassInfoList[0]
+  } else {
+    tableDatab.value = []
   }
-  if(data.bigStorageCageInfos!=null){
-    adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
-    id: index + 1,
-    height: 20/55,
-    top: 46/55,
-  }));
-subRectsCounts.value = data.bigStorageCageInfos[0][1].map(rect => rect.count);
-adjustedRectsa.value = data.bigStorageCageInfos[0][2].map((rect, index) => ({
-    id: index + 1,
-    height: 20/55,
-    top: 46/55,
-  }));
-subRectsCountsa.value = data.bigStorageCageInfos[0][2].map(rect => rect.count);
-adjustedRectsb.value = data.bigStorageCageInfos[0][3].map((rect, index) => ({
-    id: index + 1,
-    height: 20/55,
-    top: 46/55,
-  }));
-subRectsCountsb.value = data.bigStorageCageInfos[0][3].map(rect => rect.count);
-adjustedRectsc.value = data.bigStorageCageInfos[0][4].map((rect, index) => ({
-    id: index + 1,
-    height: 20/55,
-    top: 46/55,
-  }));
-subRectsCountsc.value = data.bigStorageCageInfos[0][4].map(rect => rect.count);
-adjustedRectsd.value = data.bigStorageCageInfos[0][5].map((rect, index) => ({
-    id: index + 1,
-    height: 20/55,
-    top: 46/55,
-  }));
-subRectsCountsd.value = data.bigStorageCageInfos[0][5].map(rect => rect.count);
-  }else{
+  if (data.bigStorageCageUsage != null) {
+    tableDatae.value = data.bigStorageCageUsage[0]
+  } else {
+    tableDatae.value = []
+  }
+  if (data.carPostion != null) {
+    carPosition.value = data.carPostion[0]
+  } else {
+    carPosition.value = []
+  }
+  if (data.dispatchHollowSwitch != null) {
+    diaodu.value = data.dispatchHollowSwitch[0]
+  } else {
+    diaodu.value = ''
+  }
+  if (data.priorityHollowSwitch != null) {
+    hollowPriority.value = data.priorityHollowSwitch[0]
+  } else {
+    hollowPriority.value = ''
+  }
+  if (data.bigStorageCageInfos != null) {
+    adjustedRects.value = data.bigStorageCageInfos[0][1];
+    adjustedRectsa.value = data.bigStorageCageInfos[0][2];
+    console.log(adjustedRectsa.value)
+    adjustedRectsb.value = data.bigStorageCageInfos[0][3];
+    adjustedRectsc.value = data.bigStorageCageInfos[0][4];
+    adjustedRectsd.value = data.bigStorageCageInfos[0][5];
+    adjustedRectse.value = data.bigStorageCageInfos[0][6];
+  } else {
     adjustedRects.value = '',
-    adjustedRectsa.value = '',
-    adjustedRectsb.value = '',
-    adjustedRectsc.value = ''
-    adjustedRectsd.value = ''
+      adjustedRectsa.value = '',
+      adjustedRectsb.value = '',
+      adjustedRectsc.value = '',
+      adjustedRectsd.value = '',
+      adjustedRectse.value = ''
   }
 };
-
+const getAlertText = (alarmCode) => {
+  const codeMap = {
+    sizeSame: 'hellow.sizeSame',
+    idSame: 'hellow.idSame',
+    slotLess: 'hellow.slotLess',
+    overSize: 'hellow.overSize',
+    noGlass: 'hellow.noGlass'
+  };
+  return alarmCode in codeMap
+    ? t(codeMap[alarmCode])
+    : t('hellow.unknownAlert');
+};
+// 璀︽姤鍙屽嚮寮圭獥
+const handleDoubleClick = () => {
+  showModal.value = true;
+};
 // 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
-const rectStyle = (rect, index) => ({
+const rectStyle = (rect, index, high) => ({
   position: 'absolute',
-  width: '170px',
+  width: '150px',
   left: '0px',
-  top: `${index*rect.top}px`,
+  top: `${index * high}px`,
   height: `${rect.height}px`,
 });
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
@@ -423,15 +693,17 @@
   return subRects;
 };
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const proportion = ref((150 / 6200).toFixed(2));
 const subRectStyle = (rectIndex, subIndex) => {
-  const width = '18px';
-  const marginLeft = '8px';
+  const width = `${rectIndex.length * proportion.value}px`;
+  // const width = '18px';
+  const marginLeft = '3px';
   const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
   const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
   return {
     position: 'absolute',
     width,
-    height: '100%',
+    height: '1px',
     marginLeft,
     top: '0px',
     backgroundColor: '#911005',
@@ -441,9 +713,9 @@
 // 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
 const rectStylea = (rect, index) => ({
   position: 'absolute',
-  width: '170px',
+  width: '150px',
   left: '0px',
-  top: `${index*rect.top}px`,
+  top: `${index * rect.top}px`,
   height: `${rect.height}px`,
 });
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
@@ -458,7 +730,7 @@
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
 const subRectStylea = (rectIndex, subIndex) => {
   const width = '18px';
-  const marginLeft = '8px';
+  const marginLeft = '3px';
   const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
   const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
   return {
@@ -474,9 +746,9 @@
 // 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
 const rectStyleb = (rect, index) => ({
   position: 'absolute',
-  width: '170px',
+  width: '150px',
   left: '0px',
-  top: `${index*rect.top}px`,
+  top: `${index * rect.top}px`,
   height: `${rect.height}px`,
 });
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
@@ -491,7 +763,7 @@
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
 const subRectStyleb = (rectIndex, subIndex) => {
   const width = '18px';
-  const marginLeft = '8px';
+  const marginLeft = '3px';
   const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
   const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
   return {
@@ -507,9 +779,9 @@
 // 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
 const rectStylec = (rect, index) => ({
   position: 'absolute',
-  width: '170px',
+  width: '150px',
   left: '0px',
-  top: `${index*rect.top}px`,
+  top: `${index * rect.top}px`,
   height: `${rect.height}px`,
 });
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
@@ -524,7 +796,7 @@
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
 const subRectStylec = (rectIndex, subIndex) => {
   const width = '18px';
-  const marginLeft = '8px';
+  const marginLeft = '3px';
   const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
   const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
   return {
@@ -540,9 +812,9 @@
 // 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
 const rectStyled = (rect, index) => ({
   position: 'absolute',
-  width: '170px',
+  width: '150px',
   left: '0px',
-  top: `${index*rect.top}px`,
+  top: `${index * rect.top}px`,
   height: `${rect.height}px`,
 });
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
@@ -557,7 +829,7 @@
 // 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
 const subRectStyled = (rectIndex, subIndex) => {
   const width = '18px';
-  const marginLeft = '8px';
+  const marginLeft = '3px';
   const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
   const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
   return {
@@ -570,49 +842,74 @@
     left,
   };
 };
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectse = (rectIndex) => {
+  const count = subRectsCountse.value[rectIndex];
+  const subRects = [];
+  for (let i = 0; i < count; i++) {
+    subRects.push({});
+  }
+  return subRects;
+};
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStylee = (rectIndex, subIndex) => {
+  const width = '18px';
+  const marginLeft = '3px';
+  const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+  const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
+  return {
+    position: 'absolute',
+    width,
+    height: '100%',
+    marginLeft,
+    top: '0px',
+    backgroundColor: '#911005',
+    left,
+  };
+};
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+  blindb.value = true;
+  iframeUrl.value = `${window.location.origin}/#/hollow/hellowslicecagehistory`;
+};
 onMounted(() => {
   socket = initializeWebSocket(socketUrl, handleMessage);
 });
-  onUnmounted(() => {
-    if (socket) {
+onUnmounted(() => {
+  if (socket) {
     closeWebSocket(socket);
-    }
-    });
-function getStatusType(enableState: number) {  
-  switch (enableState) {  
-    case 100:
-      return 'success';  
-    case 102: 
-      return 'warning';  
-  }  
-}  
-function getStatusText(enableState: number) {
-  switch (enableState) {
-    case 100:  
-      return t('searchOrder.zailong');
-    case 102:  
-      return t('searchOrder.rengongxp'); 
-  }  
+  }
+});
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+function formatTimestamp(timestamp) {
+  const date = new Date(timestamp);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+  const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+  const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+  const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+  const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
-function getcasOnea(isSame) {  
-  switch (isSame) {  
+function getcasOnea(isSame) {
+  switch (isSame) {
     case 1:
-      return 'danger';  
-    case 0: 
-      return 'info';  
-  }  
-}  
+      return 'danger';
+    case 0:
+      return 'info';
+  }
+}
 function getStatuscasOnea(isSame) {
   switch (isSame) {
-    case 1:  
+    case 1:
       return t('searchOrder.same');
-    case 0:  
-      return t('searchOrder.notsame'); 
-  }  
+    case 0:
+      return t('searchOrder.notsame');
+  }
 }
 function tableRowClassName({ row }) {
   if (row.isSame === 1) {
-    return 'row-red-background'; // 璁剧疆绾㈣壊鑳屾櫙
+    return 'row-red-background';
   }
   return '';
 }
@@ -622,437 +919,515 @@
 </script>
 <template>
   <div style="height: 600px;">
-    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="handlexiang">{{ $t('searchOrder.cageinformation') }}</el-button>
-    <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
+    <div v-if="showAlert" class="global-alert-bar" @dblclick="handleDoubleClick">
+      <div class="alert-content">
+        <el-icon>
+          <WarnTriangleFilled />
+        </el-icon>
+        <span class="alert-text">
+          {{ alertText }} (id:{{ alertMessage }})
+          <span class="confirm-text">{{ $t('hellow.pleaseConfirm') }}</span>
+        </span>
+      </div>
+      <button @click="showAlert = false" class="close-btn">脳</button>
+    </div>
+    <el-dialog v-model="showModal" width="40%" center>
+      <el-table ref="table" border :data="tableDataAlert" max-height="calc(500px - 35px)" style="width: 100%;">
+        <el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="100" />
+        <el-table-column :label="$t('hellow.content')" align="center" min-width="220">
+          <template #default="scope">
+            <span>
+              {{ getAlertText(scope.row.alarmCode) }}
+              (id:{{ scope.row.alarmMessage }})
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
+          <template #default="scope">
+            <el-button type="text" plain @click="handleSure(scope.row)">{{ $t('basicData.yes') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <div style="display: flex;">
+      <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="handlexiang">{{
+        $t('searchOrder.cageinformation') }}</el-button>
+      <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success"
+        @click="handlehistorical">{{
+          $t('searchOrder.historicaltasks') }}</el-button>
+      <!-- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> -->
+      <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2"
+        :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
+      <div style="display: flex;">
+        <div style="margin-left: 15px;margin-top: 5px;font-size: 14px;top: 5vh;margin-top: 12px;">{{
+          $t('searchOrder.hollowPriority') }}锛�</div>
+        <div style="margin-left: 15px;margin-top: 5px;font-size: 14px;top: 5vh;margin-top: 12px;color: #911005;">{{
+          $t('searchOrder.firstLinePriority') }}</div>
+        <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="hollowPriority" class="mb-2"
+          @change="handlehollowPriority" />
+        <div
+          style="margin-left: 15px;margin-top: 5px;font-size: 14px;top: 5vh;margin-top: 12px;color: rgb(184, 130, 48)">
+          {{
+            $t('searchOrder.secondLinePriority') }}</div>
+      </div>
+    </div>
     <div id="dotClass">
-        <div>{{ $t('searchOrder.inkageEntity') }}</div>
-        <i :style="{ marginTop: '2px', backgroundColor: inkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
-        <div style="margin-left: 70px;">{{ $t('searchOrder.requestEntity') }}</div>
-        <i :style="{ marginTop: '2px', backgroundColor: requestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
-        <div style="margin-left: 70px;">{{ $t('searchOrder.mesReplyEntity') }}</div>
-        <i :style="{ marginTop: '2px', backgroundColor: mesReplyEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
-        <div style="margin-left: 70px;">{{ $t('searchOrder.outInkageEntity') }}</div>
-        <i :style="{ marginTop: '2px', backgroundColor: outInkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
-        <div style="margin-left: 70px;">{{ $t('searchOrder.outRequestEntity') }}</div>
-        <i :style="{ marginTop: '2px', backgroundColor: outRequestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
-        <div style="margin-left: 70px;">{{ $t('hellow.freeone') }}</div>
-        <i :style="{ marginTop: '2px', backgroundColor: freeone, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
-        <div style="margin-left: 70px;">{{ $t('hellow.freetwo') }}</div>
-        <i :style="{ marginTop: '2px', backgroundColor: freetwo, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
-  </div>
+      <div>{{ $t('searchOrder.inkageEntity') }}</div>
+      <i
+        :style="{ marginTop: '2px', backgroundColor: inkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+      <div style="margin-left: 70px;">{{ $t('searchOrder.requestEntity') }}</div>
+      <i
+        :style="{ marginTop: '2px', backgroundColor: requestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+      <div style="margin-left: 70px;">{{ $t('searchOrder.mesReplyEntity') }}</div>
+      <i
+        :style="{ marginTop: '2px', backgroundColor: mesReplyEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+      <div style="margin-left: 70px;">{{ $t('searchOrder.outInkageEntity') }}</div>
+      <i
+        :style="{ marginTop: '2px', backgroundColor: outInkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+      <div style="margin-left: 70px;">{{ $t('searchOrder.outRequestEntity') }}</div>
+      <i
+        :style="{ marginTop: '2px', backgroundColor: outRequestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+      <div style="margin-left: 70px;">{{ $t('hellow.freeone') }}</div>
+      <i
+        :style="{ marginTop: '2px', backgroundColor: freeone, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+      <div style="margin-left: 70px;">{{ $t('hellow.freetwo') }}</div>
+      <i
+        :style="{ marginTop: '2px', backgroundColor: freetwo, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+      <div style="margin-left: 70px;">{{ $t('hellow.freethree') }}</div>
+      <i
+        :style="{ marginTop: '2px', backgroundColor: freethree, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+    </div>
+    <div style="display: flex; align-items: flex-start; gap: 20px; height: 70vh;">
+      <!-- // 鐖剁骇妗� -->
+      <div class="img-zkdlpl">
+        <div class="img-car1" :style="'z-index:999;left:212px;top:' + 1300 * carPosition[0] + 'px;position:absolute;'">
+          <div v-for="(rect, index) in adjusta" :key="rect.id" :style="{
+            width: '30px',
+            height: '5px',
+            backgroundColor: '#409EFF',
+            marginLeft: 5 + `px`,
+            top: '10px',
+          }">
+          </div>
+        </div>
+        <div class="img-car4" :style="'z-index:999;left:580px;top:' + 450 * carPosition[1] + 'px;position:absolute;'">
+          <div v-for="(rect, index) in adjust" :key="rect.id" :style="{
+            width: '30px',
+            height: '5px',
+            backgroundColor: '#409EFF',
+            marginLeft: 5 + `px`,
+            top: '10px',
+          }">
+          </div>
+        </div>
+        <div style="position: relative;">
+          <div v-show="cell1" style="width: 150px;height: 64px;position: relative;top:82px;left: 415px;">
+            <div v-for="(rect, rectIndex) in Object.values(adjustedRects)" :key="rect.id" :style="rectStyle(rect, rectIndex,1.6)">
+              <div v-for="(subRect, subIndex) in rect" :key="subIndex"
+                :style="subRectStyle(subRect, subIndex)"></div>
+            </div>
+          </div>
+          <div v-show="cell2" style="width: 150px;height: 64px;position: relative;top:88px;left: 415px;">
+            <div v-for="(rect, rectIndex) in Object.values(adjustedRectsa)" :key="rect.id" :style="rectStyle(rect, rectIndex,1.16)">
+              <div v-for="(subRect, subIndex) in rect" :key="subIndex"
+                :style="subRectStyle(subRect, subIndex)"></div>
+            </div>
+          </div>
+          <div v-show="cell3" style="width: 150px;height: 64px;position: relative;top:93px;left: 415px;">
+            <div v-for="(rect, rectIndex) in Object.values(adjustedRectsb)" :key="rect.id" :style="rectStyle(rect, rectIndex,1.16)">
+              <div v-for="(subRect, subIndex) in rect" :key="subIndex"
+                :style="subRectStyle(subRect, subIndex)"></div>
+            </div>
+          </div>
+          <div v-show="cell4" style="width: 150px;height: 64px;position: relative;top:99px;left: 415px;">
+            <div v-for="(rect, rectIndex) in Object.values(adjustedRectsc)" :key="rect.id" :style="rectStyle(rect, rectIndex,1.16)">
+              <div v-for="(subRect, subIndex) in rect" :key="subIndex"
+                :style="subRectStyle(subRect, subIndex)"></div>
+            </div>
+          </div>
+          <div v-show="cell5" style="width: 150px;height: 64px;position: relative;top:105px;left: 415px;">
+            <div v-for="(rect, rectIndex) in Object.values(adjustedRectsd)" :key="rect.id" :style="rectStyle(rect, rectIndex,1.16)">
+              <div v-for="(subRect, subIndex) in rect" :key="subIndex"
+                :style="subRectStyle(subRect, subIndex)"></div>
+            </div>
+          </div>
+          <div v-show="cell6" style="width: 150px;height: 64px;position: relative;top:28px;left: 40px;">
+            <div v-for="(rect, rectIndex) in Object.values(adjustedRectse)" :key="rect.id" :style="rectStyle(rect, rectIndex,2.56)">
+              <div v-for="(subRect, subIndex) in rect" :key="subIndex"
+                :style="subRectStyle(subRect, subIndex)"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <el-card style="flex: 1; height: 500px; overflow-y: auto;">
+        <div style="width: 100%; height: 100%; overflow: hidden;">
+          <el-table ref="table" style="margin-top: 20px; height: 700px;" :data="tableDatass"
+      :row-class-name="tableRowClassName" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
+      row-key="projectNumber">
+      <el-table-column>
+        <template #default="props">
+          <el-table :data="props.row.flowCardGlassInfoDTOList" style="width: 100%"
+            :row-class-name="(row) => nestedTableRowClassName(props.row, row)">
+            <el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="50" />
+            <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="50" />
+            <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80" />
+            <el-table-column prop="sumCount" align="center" :label="$t('hellow.totalnumber')" min-width="80" />
+            <el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="80" />
+            <el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80" />
+            <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="100" />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20" />
+      <!-- <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20" /> -->
+      <!-- <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20" /> -->
+      <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="82">
+        <template #default="scope">
+          <el-button type="text" plain @click="handleSliceRack(scope.row)">{{
+            $t('hellow.missingfilms')
+          }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+        </div>
+      </el-card>
+    </div>
+    <div style="padding: 10px;display: flex;height:110px;margin-top: -170px;">
+      <div v-for="(item, index) in tableDatae" :key="index" id="occupy">
+        <el-col style="text-align:left;font-weight: bold;">#{{ item.device_id }}</el-col>
+        <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+          <span>{{ $t('searchOrder.Usage') }}</span><span>{{ item.percentage }}%</span>
+        </el-col>
+        <hr style="width:80%;margin: 0 auto;" />
+        <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">
+          <span>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>
+        </el-col>
+      </div>
+    </div>
     <div class="table-container">
-    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
-      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
-       <el-table height="300px" ref="table" 
-       :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-         <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
-         <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
-         <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
-         <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
-           <template #default="scope">
-             <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
-           </template>
-         </el-table-column>
-       </el-table>
-       </div>
-    </el-card>
-    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
-      <el-table height="300px" ref="table" 
-        @selection-change="handleSelectionChange"
-        :row-class-name="tableRowClassName"
-        :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-          <el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
+      <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+        <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 140px;">
+          <el-table height="120px" ref="table" :row-class-name="tableRowClassName" :data="tableDatad"
+            :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+            <el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
+            <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
+            <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')"
+              min-width="120" />
+            <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
+              <template #default="scope">
+                <el-tag type="success">{{ scope.row.taskState == 0 ? $t('searchOrder.filmenter') : $t('searchOrder.infilm')
+                  }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
+              <template #default="scope">
+                <el-tag :type="getcasOnea(scope.row.isSame)">
+                  {{ getStatuscasOnea(scope.row.isSame) }}
+                </el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-card>
+      <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+        <el-table height="120px" ref="table" :data="tableDatac"
+          :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+          <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" />
           <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
           <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
-          <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
-          <template #default="scope">
-            <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
-          </template>
-          </el-table-column>
-          <el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
-          <template #default="scope">
-        <el-tag :type="getcasOnea(scope.row.isSame)">
-          {{ getStatuscasOnea(scope.row.isSame) }}
-        </el-tag>
-      </template>
+          <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
+            <template #default="scope">
+              <el-tag type="success">{{ scope.row.taskState == 0 ? $t('searchOrder.filmenter') : $t('searchOrder.infilm')
+                }}</el-tag>
+            </template>
           </el-table-column>
         </el-table>
-            </el-card>
-  </div>
-    <div style="padding: 10px;display: flex;height:130px;">
-            <div v-for="(item, index) in tableDatae" :key="index" id="occupy">  
-               <el-col style="text-align:left;font-weight: bold;">#{{ item.device_id }}</el-col>  
-               <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">  
-                 <span>{{ $t('searchOrder.Usage') }}</span><span>{{ item.percentage }}%</span>  
-               </el-col>  
-               <hr style="width:80%;margin: 0 auto;" />  
-               <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">  
-                 <span>{{ $t('searchOrder.free') }}</span><span>{{ item.count }}</span>  
-               </el-col>  
-             </div>  
+      </el-card>
     </div>
-<!-- // 鐖剁骇妗� -->
-<div class="img-dlpl" >
-    <div class="img-car1" :style="'z-index:999;left:305px;top:' + 1700*carPosition[0] + 'px;position:absolute;'">
-      <div  
-      v-for="(rect, index) in adjusta"  
-      :key="rect.id"  
-      :style="{
-       width: '30px',
-       height: '5px',
-       backgroundColor: '#409EFF',
-       marginLeft: 5+ `px`,
-       top: '10px',
-       }"  
-    >
-    </div>
-    </div>
-    <div class="img-car4" :style="'z-index:999;left:730px;top:' + 600*carPosition[1] + 'px;position:absolute;'">
-      <div  
-      v-for="(rect, index) in adjust"  
-      :key="rect.id"  
-      :style="{
-       width: '30px',
-       height: '5px',
-       backgroundColor: '#409EFF',
-       marginLeft: 5+ `px`,
-       top: '10px',
-       }"  
-    >
-    </div>
-    </div>
-    <div style="position: relative;">
-    <div v-show="cell1" style="width: 170px;height: 46px;position: relative;top:387px;left: 523px;">
-      <div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
-    <div
-      v-for="(subRect, subIndex) in getSubRects(rectIndex)"
-      :key="subIndex"
-      :style="subRectStyle(rectIndex, subIndex)"
-    ></div>
-    </div>
-    </div>
- <div v-show="cell2" style="width: 170px;height: 46px;position: relative;top:389px;left: 523px;">
-  <div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
-    <div
-      v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
-      :key="subIndex"
-      :style="subRectStylea(rectIndex, subIndex)"
-    ></div>
-    </div>
-    </div>
-  <div v-show="cell3" style="width: 170px;height: 46px;position: relative;top:391px;left: 523px;">
-    <div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
-    <div
-      v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
-      :key="subIndex"
-      :style="subRectStyleb(rectIndex, subIndex)"
-    ></div>
-    </div>
-    </div>
-  <div v-show="cell4" style="width: 170px;height: 46px;position: relative;top:392px;left: 523px;">
-    <div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
-    <div
-      v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
-      :key="subIndex"
-      :style="subRectStylec(rectIndex, subIndex)"
-    ></div>
-    </div>
-    </div>
-  <div v-show="cell5" style="width: 170px;height: 46px;position: relative;top:394px;left: 523px;">
-    <div v-for="(rect, rectIndex) in adjustedRectsd" :key="rect.id" :style="rectStyled(rect, rectIndex)">
-    <div
-      v-for="(subRect, subIndex) in getSubRectsd(rectIndex)"
-      :key="subIndex"
-      :style="subRectStyled(rectIndex, subIndex)"
-    ></div>
-    </div>
-    </div>
-</div>
-</div>
-<el-card style="flex: 1;margin-left: 1020px;margin-top: -670px;" v-loading="loading">
-      <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 550px;">
-       <el-table height="550px" ref="table" border 
-       :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-         <el-table-column prop="glassId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
-         <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.totallogarithms')" min-width="120" />
-         <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.numberpairs')" min-width="120" />
-         <el-table-column prop="targetSlot" align="center" :label="$t('hellow.totalnumber')" min-width="120" />
-         <el-table-column prop="startSlot" align="center" :label="$t('hellow.realpieces')" min-width="120" />
-         <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.numberoccupied')" min-width="120" />
-       </el-table>
-       </div>
-    </el-card>
   </div>
   <!-- 娣诲姞鐞嗙墖绗间俊鎭� -->
-  <el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
+  <el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')">
     <div style="margin-bottom: 20px">
       <el-form>
         <el-row style="margin-top: -15px;margin-bottom: -2px;">
           <el-col :span="4">
-              <div id="dt" style="font-size: 15px;">
-              <el-form-item :label="$t('searchOrder.tida')"  style="width: 14vw">
+            <div id="dt" style="font-size: 15px;">
+              <el-form-item :label="$t('searchOrder.tida')" style="width: 14vw">
                 {{ currentRow.deviceId }}
               </el-form-item>
-              </div>
+            </div>
           </el-col>
           <el-col :span="5">
             <div id="dta" style="font-size: 15px;">
-          <el-form-item :label="$t('searchOrder.gridnumbera')" style="width: 14vw">
+              <el-form-item :label="$t('searchOrder.gridnumbera')" style="width: 14vw">
                 {{ currentRow.slot }}
               </el-form-item>
-              </div>
+            </div>
           </el-col>
         </el-row>
       </el-form>
     </div>
-      <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
-          <el-input v-model="glassId"   :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
-          </el-input>
-          <el-button type="primary" plain style="margin-left: 10px;" @click="searchout">{{ $t('searchOrder.search') }}</el-button>
+    <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
+      <el-input v-model="glassId" :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
+      </el-input>
+      <el-button type="primary" plain style="margin-left: 10px;" @click="searchout">{{ $t('searchOrder.search')
+        }}</el-button>
     </div>
     <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
-        <el-table height="100%" ref="table"
-        :data="tableDataf" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-          <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120" />
-          <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="180" />
-          <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
-          <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="150"/>
-          <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="150"/>
-          <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="150"/>
-          <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="150"/>
-          <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="150"/>
-          <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="150"/>
-          <el-table-column
-          align="center"
-            :label="$t('searchOrder.startstatus')"
-            min-width="80"
-            prop="state"
-          >
-          <template #default="scope">  
-          <el-tag  
-            :type="scope.row.state === 1 ? 'success' : 'danger'"  
-          >  
-          {{ scope.row.state === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable') }}
-          </el-tag>  
-        </template> 
-          </el-table-column>
-          <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150"/>
-          <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
-            <template #default="scope">
-              <el-button size="mini" type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
-            </template>
+      <el-table height="100%" ref="table" :data="tableDataf"
+        :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+        <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120" />
+        <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="180" />
+        <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+        <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="150" />
+        <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="150" />
+        <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="150" />
+        <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="150" />
+        <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="150" />
+        <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')"
+          min-width="150" />
+        <el-table-column align="center" :label="$t('searchOrder.startstatus')" min-width="80" prop="state">
+          <template #default="scope">
+            <el-tag :type="scope.row.state === 1 ? 'success' : 'danger'">
+              {{ scope.row.state === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable') }}
+            </el-tag>
+          </template>
         </el-table-column>
-        </el-table>
-      </div>
+        <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150" />
+        <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
+          <template #default="scope">
+            <el-button type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
   </el-dialog>
   <!-- 鐞嗙墖绗间俊鎭� -->
-<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
-  <div style="display: flex;">
-    <el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
-    <el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
-    <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchxianga">
-      {{$t('reportmanage.inquire')}}</el-button>
-  </div>
-    <el-table  
-          :data="tableDataa" 
-          @row-click="handleRowClick" 
-          height="700"
-          @expand-change="handleExpandChange"  
-          row-key="id" 
-          default-expand-all
-          :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" 
-        >  
-          <el-table-column type="expand">  
-            <template #default="props">  
-              <div v-if="props.row.hollowBigStorageCageDetails && props.row.hollowBigStorageCageDetails.length">  
-                <el-table  
-                  :data="props.row.hollowBigStorageCageDetails"  
-                  border
-                  style="width: 100%;margin-left: 20px;"  
-                  row-key="id"  
-                  :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" 
-                >  
-          <!-- <el-table-column prop="menuName" label="浜岀骇鑿滃崟鏍�" align="center" min-width="140" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"/>   -->
-          <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130"/>
-          <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
-          <el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
-          <!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="80" /> -->
-          <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
-          <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
-          <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
-          <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
-          <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
-          <el-table-column
-            align="center"
-            :label="$t('searchOrder.startstatus')"
-            min-width="80"
-            prop="state"
-          >
-          <template #default="scope">  
-        <el-tag :type="getStatusType(scope.row.state)">  
-          {{ getStatusText(scope.row.state) }}  
-        </el-tag>  
-      </template> 
-          </el-table-column>
-          <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
-           <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center"  min-width="220">
-            <template #default="scope">
-              <el-button size="mini" type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
-              <el-button size="mini" type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
-              <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
-            </template>
-        </el-table-column>
-                </el-table>
-              </div>  
-            </template>  
-          </el-table-column>  
-          <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/>  
-          <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="150" />
-          <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
-          <el-table-column
-          align="center"
-            :label="$t('searchOrder.startstatus')"
-            min-width="80"
-            prop="enableState"
-          >
-          <template #default="scope">  
-          <el-tag  
-            :type="scope.row.enableState === 1 ? 'success' : 'danger'"  
-            @click="toggleEnableState(scope.row)"  
-          >  
-            {{ scope.row.enableState === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable')}}  
-          </el-tag>  
-        </template> 
-          </el-table-column>
-          <el-table-column prop="remainWidth" align="center" :label="$t('searchOrder.remainingwidth')" min-width="120" />
-          
-       <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
-            <template #default="scope">
-              <el-button size="mini" type="text" plain  @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
-            </template>
-        </el-table-column>
-        </el-table>
-        <div>
-    <div style="margin-top: 20px;margin-left: 40%;">
-      <el-pagination
-          background
-          size="large"
-          layout="prev, pager, next"
-          :total="50"
-          :current-page.sync="currentPage2"
-          @current-change="handlePageChange2"
-        />
+  <el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
+    <div style="display: flex;">
+      <el-input v-model="engineerId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;"
+        :placeholder="$t('processCard.projectnumber')" />
+      <el-input v-model="glassId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;"
+        :placeholder="$t('searchOrder.inglassID')" />
+      <el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;"
+        :placeholder="$t('searchOrder.incardnumber')" />
+      <el-input v-model="filmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;"
+        :placeholder="$t('film.infilms')" />
+      <el-input v-model="thickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;"
+        :placeholder="$t('searchOrder.inthickness')" />
+      <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchxianga">
+        {{ $t('reportmanage.inquire') }}</el-button>
     </div>
-  </div>
+    <el-table ref="table" style="margin-top: 20px;height: 700px;width: 1770px;" :data="tableDataa"
+      :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+      <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="150" />
+      <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="100" />
+      <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+      <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="120" />
+      <el-table-column align="center" :label="$t('searchOrder.startstatus')" min-width="80" prop="enableState">
+        <template #default="scope">
+          <el-tag :type="scope.row.enableState === 1 ? 'success' : 'danger'" @click="toggleEnableState(scope.row)">
+            {{ scope.row.enableState === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable') }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remainWidth" align="center" :label="$t('searchOrder.remainingwidth')" min-width="120" />
+      <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130" />
+      <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
+      <el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+      <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
+      <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
+      <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
+      <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+      <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')"
+        min-width="120" />
+      <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
+      <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="240">
+        <template #default="scope">
+          <!-- <el-button type="text" plain  @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button> -->
+          <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+          <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
+          <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div>
+    </div>
+  </el-dialog>
+  <!-- 缂虹墖璇︽儏 -->
+<LackDetailDialog
+  v-model="dialogFormVisibleLack"
+  :flow-card-id="currentRow.flowCardId"
+  @refresh-data="fetchFlowCardId"
+/>
+  <!-- 澶氭潯鐮存崯鏁版嵁 -->
+  <el-dialog v-model="dialogFormVisibleb" top="15vh" width="70%" height="500">
+    <el-button plain @click="handleAllBroke">{{ $t('order.dilapidationAll') }}</el-button>
+    <el-table ref="table" style="margin-top: 20px;height: 400px;" :data="tableDataMiss"
+      :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+      <el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" min-width="80" />
+      <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
+      <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80" />
+      <el-table-column prop="workingProcedure" align="center" :label="$t('searchOrder.process')" min-width="80" />
+      <el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
+      <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
+      <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
+        <template #default="scope">
+          <el-button type="text" plain @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+  <!-- 鍘嗗彶浠诲姟 -->
+  <el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl = ''">
+    <iframe :src="iframeUrl" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+      frameborder="0"></iframe>
   </el-dialog>
 </template>
 <style>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
-#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
-#dialog-footer{
+#dt {
+  display: block;
+  float: left;
+  line-height: 20px;
+  margin-left: 100px;
+}
+
+#dta {
+  display: block;
+  float: left;
+  line-height: 20px;
+  margin-left: 80%;
+}
+
+#dialog-footer {
   text-align: center;
   margin-top: -15px;
 }
-#message{
+
+#message {
   text-align: center;
   align-items: center;
   color: black;
-   width: 200px;
-   height: 100px;
-   background-color: #337ecc;
-   margin-left: 28%;
+  width: 200px;
+  height: 100px;
+  background-color: #337ecc;
+  margin-left: 28%;
 }
-#awatch{
+
+#awatch {
   height: 450px;
 }
+
 #occupy {
-    height: 100%;
-    width: 15%;
-    background-color: white;
-    margin: 0px 8px 0px 8px;
-    border: 1px #EBEEF5 solid;
-    text-align: center;
-    padding: 5px;
+  height: 100%;
+  width: 15%;
+  background-color: white;
+  margin: 0px 8px 0px 8px;
+  border: 1px #EBEEF5 solid;
+  text-align: center;
+  padding: 5px;
 }
+
 #biao {
-    font-size: 12px;
+  font-size: 12px;
 }
+
 #zhi {
-    font-size: 18px;
-    font-weight: bold;
+  font-size: 18px;
+  font-weight: bold;
 }
-#demo-pagination-block + #demo-pagination-block {
+
+#demo-pagination-block+#demo-pagination-block {
   margin-top: 10px;
 }
+
 #demo-pagination-block #demonstration {
   margin-bottom: 16px;
 }
+
 ::-webkit-scrollbar {
-     width: 0 !important;
-   }
-   ::-webkit-scrollbar {
-     width: 0 !important;height: 0;
-   }
-   .img-list{
-  position:relative;
+  width: 0 !important;
 }
-.data-img{
-  @apply float-none ;
-  width:100%;
-  height:16rem;
+
+::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0;
+}
+
+.img-list {
+  position: relative;
+}
+
+.data-img {
+  @apply float-none;
+  width: 100%;
+  height: 16rem;
   background: rgba(0, 0, 0, 0);
   opacity: 1;
   border-radius: 0.5rem 0.5rem 0px 0px;
 }
-.check-img{
+
+.check-img {
   position: absolute;
   width: 3.3125rem;
   height: 2.9375rem;
-  top:20rem;
+  top: 20rem;
   right: 57rem;
   z-index: 10;
 }
-.check-imga{
+
+.check-imga {
   position: absolute;
   width: 3.3125rem;
   height: 2.9375rem;
-  top:15rem;
+  top: 15rem;
   right: 28.5rem;
   z-index: 10;
 }
+
 .vertical {
-    width: 45px;
-    height: 25px;
-    background-color: #409EFF;
-    top: 485px; /* 鍒濆浣嶇疆 */
-    left: 899px; /* 姘村钩灞呬腑 */
-    transform: translateX(-50%);
-    animation: move-vertical 6s infinite; /* 浠庝笂鍒颁笅鍔ㄧ敾锛屾寔缁�6绉掞紝鏃犻檺寰幆 */
+  width: 45px;
+  height: 25px;
+  background-color: #409EFF;
+  top: 485px;
+  /* 鍒濆浣嶇疆 */
+  left: 899px;
+  /* 姘村钩灞呬腑 */
+  transform: translateX(-50%);
+  animation: move-vertical 6s infinite;
+  /* 浠庝笂鍒颁笅鍔ㄧ敾锛屾寔缁�6绉掞紝鏃犻檺寰幆 */
 }
+
 @keyframes move-vertical {
-    0% {
-        top: 485px; /* 璧峰浣嶇疆 */
-    }
-    100% {
-        top: calc(100% - 210px); /* 浠庝笂鍒颁笅缁撴潫浣嶇疆 */
-    }
+  0% {
+    top: 485px;
+    /* 璧峰浣嶇疆 */
+  }
+
+  100% {
+    top: calc(100% - 210px);
+    /* 浠庝笂鍒颁笅缁撴潫浣嶇疆 */
+  }
 }
-.img-dlpl{
+
+.img-zkdlpl {
   margin-left: 20px;
   margin-top: 0px;
-  background-image:url('../../assets/zhongkong.png');
+  background-image: url('/src/assets/zhongkong.png');
   background-repeat: no-repeat;
   background-attachment: local;
-  min-height: 700px;
-  width: 1000px;
+  min-height: 500px;
+  width: 800px;
   max-width: 100%;
-  background-size: 1000px 700px;
+  background-size: 800px 500px;
   overflow: hidden;
-  position:relative
+  position: relative
 }
-.img-car1{
+
+.img-car1 {
   display: flex;
-  background-image:url('../../assets/xiaoche.png');
+  background-image: url('/xiaoche.png');
   position: absolute;
   background-repeat: no-repeat;
   background-attachment: local;
@@ -1061,11 +1436,12 @@
   max-width: 100%;
   background-size: 200px 70px;
   overflow: hidden;
-  position:relative
+  position: relative
 }
-.img-car4{
+
+.img-car4 {
   display: flex;
-  background-image:url('../../assets/xiaoche.png');
+  background-image: url('/xiaoche.png');
   position: absolute;
   background-repeat: no-repeat;
   background-attachment: local;
@@ -1074,25 +1450,97 @@
   max-width: 100%;
   background-size: 200px 70px;
   overflow: hidden;
-  position:relative
+  position: relative
 }
+
 .table-container {
   display: flex;
-  flex-wrap: nowrap; /* 闃叉鎹㈣ */
-  justify-content: space-between; /* 鏍规嵁闇�瑕佽皟鏁村瓙鍏冪礌涔嬮棿鐨勯棿璺� */
+  flex-wrap: nowrap;
+  /* 闃叉鎹㈣ */
+  justify-content: space-between;
+  /* 鏍规嵁闇�瑕佽皟鏁村瓙鍏冪礌涔嬮棿鐨勯棿璺� */
 }
-.table-container > el-card {
-  flex: 1; /* 浣夸袱涓崱鐗囧钩鍒嗗彲鐢ㄧ┖闂� */
-  margin-bottom: 10px; /* 鍙�夛紝鏍规嵁闇�瑕佹坊鍔犲簳閮ㄩ棿璺� */
+
+.table-container>el-card {
+  flex: 1;
+  /* 浣夸袱涓崱鐗囧钩鍒嗗彲鐢ㄧ┖闂� */
+  margin-bottom: 10px;
+  /* 鍙�夛紝鏍规嵁闇�瑕佹坊鍔犲簳閮ㄩ棿璺� */
 }
+
 #dotClass {
   display: flex;
-  margin-left: 20px; 
+  margin-left: 20px;
   size: 50px;
   margin-top: 20px;
   margin-bottom: 10px;
 }
+
 .row-red-background {
   background-color: #CDAF95 !important;
 }
+
+.global-alert-bar {
+  position: fixed;
+  top: 0;
+  left: 50%;
+  /* 姘村钩灞呬腑鍏抽敭 */
+  transform: translateX(-50%);
+  /* 姘村钩灞呬腑鍏抽敭 */
+  padding: 12px 20px;
+  background-color: #dbdbd7;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  z-index: 9999;
+  max-width: 80%;
+  /* 闃叉灏忓睆骞曟孩鍑� */
+  min-width: 400px;
+  /* 鏈�灏忓搴︿繚璇� */
+}
+
+/* 鎻愮ず鍐呭灞呬腑 */
+.alert-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-grow: 1;
+  /* 鍗犳嵁鍙敤绌洪棿 */
+}
+
+/* 鎻愮ず鏂囧瓧鏍峰紡 */
+.alert-text {
+  margin-left: 8px;
+  text-align: center;
+  font-weight: bold;
+  color: #0d0d0d;
+}
+
+/* 鍏抽棴鎸夐挳鏍峰紡 */
+.close-btn {
+  background: none;
+  border: none;
+  font-size: 1.5rem;
+  cursor: pointer;
+  margin-left: 20px;
+}
+
+/* 椤甸潰瀹瑰櫒椤堕儴鍐呰竟璺� */
+#app-container {
+  padding-top: 60px;
+  /* 鏍规嵁alert楂樺害璋冩暣 */
+}
+
+.confirm-text {
+  color: rgb(242, 121, 8);
+  display: block;
+  /* 寮哄埗鎹㈣ */
+  text-align: center;
+  /* 姘村钩灞呬腑 */
+  margin-top: 4px;
+  /* 涓庝笂涓�琛屼繚鎸侀棿璺� */
+  font-weight: 500;
+  /* 鍔犵矖绐佸嚭 */
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0