From 63100c0391d3a4f1d41ac5e580625913b2edd265 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 04 十一月 2025 13:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/Slicecage/slicecage.vue | 2251 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1,478 insertions(+), 773 deletions(-)

diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 2a42c23..84d93f7 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1,182 +1,118 @@
 <script lang="ts" setup>
-// import zhCn from 'element-plus/lib/locale/lang/zh-cn'
-// import en from 'element-plus/dist/locale/en.mjs'
-// const { locale } = useI18n()
-
-import { useI18n } from 'vue-i18n'
-  const { t } = useI18n()
-  let language = ref(localStorage.getItem('lang') || 'zh')
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
+import {useI18n} from 'vue-i18n'
 import {useRouter} from "vue-router"
-const router = useRouter()
 import request from "@/utils/request"
-import { WebSocketHost ,host} from '@/utils/constants'
-import { ref, onMounted , onBeforeUnmount} from "vue";
-import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { tr } from "element-plus/es/locale";
-const dialogFormVisible = ref(false)
+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'
+const scanGlass = ref([])
+const {t} = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+import { inject } from 'vue';
+const router = useRouter()
+const timeRange = ref([])
 const dialogFormVisiblea = ref(false)
-const dialogFormVisibleb = ref(false)
-const tableData = ref([])
+const dialogFormVisiblec = ref(false)
+const dialogFormVisibled = ref(false)
+const dialogFormVisiblee = ref(false)
+const dialogFormVisiblef = ref(false)
+const dialogFormVisibles = ref(false)
+const isLoading = ref(true)
+const blindb = ref(false)
+const inkageEntity = ref('#911005');
+const requestEntity = ref('#911005');
+const mesReplyEntity = ref('#911005');
+const outInkageEntity = ref('#911005');
+const outRequestEntity = ref('#911005');
+const tableDataa = ref([])
+const tableDatagh = ref([])
 const tableDatab = ref([])
 const tableDatac = ref([])
 const tableDatad = ref([])
+const tableDataf = ref([])
 const tableDatae = ref([])
+const tableDatas = ref([])
+const tableDatass = ref([])
+const tableDatax = ref([]);
+const tableDatalack = ref([])
+const tableDataspecify = ref([])
+const tableDatacagedetails = ref([])
+const selectValuesa = reactive([]);
+const carPosition = ref([])
+const ganghua = ref('')
+const engineerId = ref('')
+const diaodu = ref('')
+const flowCardId = ref('')
+const filmsId = ref('')
+const adjust = ref([]);
+const adjusta = ref([]);
 const adjustedRects = ref([]);
 const adjustedRectsa = ref([]);
-// const height = ref([]);
+const adjustedRectsb = ref([]);
+const adjustedRectsc = ref([]);
+const subRectsCounts = ref([]);
+const subRectsCountsa = ref([]);
+const subRectsCountsb = ref([]);
+const subRectsCountsc = ref([]);
+const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁 
+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 currentPage2 = ref(1)
+const globalDate = inject('globalDate');
+const inputValuesa = reactive({});
 const add = ref(false)
-const flowCardId = ref('');
 const gap = ref('');
 const glassId = ref('');
-const glassType = ref('');
-const height = ref('');
-const sequence = ref('');
-const state = ref('');
-const temperingFeedSequence = ref('');
-const temperingLayoutId = ref('');
+const startSlot = ref('');
+const targetSlot = ref('');
+const taskStateList = ref('');
+const taskTypeList = ref('');
+const beginDate = ref('');
+const endDate = ref('');
 const thickness = ref('');
 const width = ref('');
-const carposition1 = ref(60);
-const carposition2 = ref(220);
-const carposition3 = ref(60);
-const carposition4 = ref(260);
-const timers1 =ref(true);
-const timers2 =ref(true);
-const timers3 =ref(true);
-const timers4 =ref(true);
-const cellshow5=ref(false);
-const c1=ref(false);
-const c2=ref(false);
-const cellshow1=ref(true);
-const cellshow2=ref(true);
-const cellshow3=ref(true);
-const cellshow4=ref(true);
-const million=ref(0);
-const million1=ref(0);
-const million3=ref(0);
-const million4=ref(0);
 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 selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁  
- 
-const currentPage4 = ref(4)
-const pageSize4 = ref(100)
- 
-  // var timer=setInterval(() => {
-  //   // console.log(million.value,million1.value);
-  //   million.value+=1;
-  //   if(million.value-million1.value!==12){
-      
-  //     if(million.value-million1.value>=2){
-  //       if(carposition1.value==220){
-  //         timers1.value=false;
-  //       }else if(carposition1.value==60){
-  //         timers1.value=true;
-  //       }
-  //       if(timers1.value==true){
-  //         carposition1.value=carposition1.value+16;
-  //       }else{
-  //         carposition1.value=carposition1.value-16;
-  //       }
- 
-        
-  //       if(carposition2.value==220){
-  //         timers2.value=false;
-  //       }else if(carposition2.value==60){
-  //         timers2.value=true;
-  //       }
-  //       if(timers2.value==true){
-  //         carposition2.value+=16;
-  //       }else{
-  //         carposition2.value-=16;
-  //       }
-  //     }else{
- 
-  //     }
-  //   }else{
-  //     million1.value=million.value;
-    
-  //     if(cellshow1.value==true){
-  //       cellshow1.value=false;
-  //     }else{
-  //       cellshow1.value=true;
-  //     }
-  //     if(cellshow2.value==true){
-  //       cellshow2.value=false;
-  //     }else{
-  //       cellshow2.value=true;
-  //     }
-  //   }
-    
-  // }, 1000);
- 
-  // var timer=setInterval(() => {
-  //   // console.log(million3.value,million4.value);
-  //   million3.value+=1;
-  //   if(million3.value-million4.value!==12){
-      
-  //     if(million3.value-million4.value>=2){
-  //       if(carposition3.value==260){
-  //         timers3.value=false;
-  //       }else if(carposition3.value==60){
-  //         timers3.value=true;
-  //       }
-  //       if(timers3.value==true){
-  //         carposition3.value=carposition3.value+20;
-  //       }else{
-  //         carposition3.value=carposition3.value-20;
-  //       }
- 
-        
-  //       if(carposition4.value==260){
-  //         timers4.value=false;
-  //       }else if(carposition4.value==60){
-  //         timers4.value=true;
-  //       }
-  //       if(timers4.value==true){
-  //         carposition4.value+=20;
-  //       }else{
-  //         carposition4.value-=20;
-  //       }
-  //     }else{
- 
-  //     }
-  //   }else{
-  //     million4.value=million3.value;
-  //     if(cellshow5.value==true){
-  //       cellshow5.value=false;
-        
-  //     }else{
-  //       cellshow5.value=true;
-        
-  //     }
-  //     if(cellshow3.value==true){
-  //       cellshow3.value=false;
-  //     }else{
-  //       cellshow3.value=true;
-  //     }
-  //     if(cellshow4.value==true){
-  //       cellshow4.value=false;
-  //     }else{
-  //       cellshow4.value=true;
-  //     }
-  //   }
-    
-  // }, 1000);
-
+const canEdit = ref(true);
+const selectedRow = ref(null);
+const temperingtotal = ref(0);
+const glasstotal = ref(0);
+const fulltotals = ref(0);
+const temperingengineerId=ref('');
+const printFlowCardId = ref('')
+const printLayer = ref('')
+const printGlassId = ref('')
+const open1 = async (row) => {
+printFlowCardId.value = row.flowCardId;
+printLayer.value = row.layer
+printGlassId.value = row.glassId
+}
+const selectGong = async () => {
+  try {
+    const response = await request.get('/cacheVerticalGlass/bigStorageCageHistoryTask/queryAllMessage');
+    if (response.code == 200) {
+    }
+  } catch (error) {
+  }
+};
+//     setInterval(() => {  
+//     localStorage.clear(); // 娓呴櫎鎵�鏈塴ocalStorage鏁版嵁  
+// }, 60000);
+//  function cleanUp() {
+// }
+// // 鍋囪鎴戜滑姣�2鍒嗛挓鎵ц涓�娆℃竻鐞�  
+// setInterval(cleanUp, 1 * 60 * 1000);
 const getTableRow = (row,type) =>{
   switch (type) {
     case 'edit' :{
-      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
       router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
       break
     }
@@ -186,87 +122,38 @@
     }
   }
 }
+const handlePageChange2 = (newPage) => {
+  currentPage2.value = newPage;
+  window.localStorage.setItem('pagenumber', currentPage2.value)
+  fetchxiang(currentPage2.value);
+};
 const handleBindRack = (row) => {
   selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁  
-  add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+  currentRow.deviceId  = row.deviceId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�  
+  currentRow.slot = row.slot;  
+  window.localStorage.setItem('deviceId', row.deviceId)
+  window.localStorage.setItem('slot', row.slot)
+  add.value = true;
 };
-async function handleConfirm() {
-  if (!selectedRow.value) {  
-    // 澶勭悊娌℃湁閫変腑琛岀殑鎯呭喌...  
-    return;  
-  }  
-  
-  // 鏋勯�犱綘鐨凱OST璇锋眰鏁版嵁锛屽寘鍚�変腑鐨勮鏁版嵁鍜岃〃鍗曟暟鎹�  
-  const postData = {  
-    ...selectedRow.value, // 閫変腑琛岀殑鏁版嵁  
-  };  
-  
+// 鎼滅储
+const searchout = async () => {
   try {
-    const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', {
-      'flowCardId': flowCardId.value,
-      'gap': gap.value,
-      'glassId': glassId.value,
-      'glassType': glassType.value,
-      'height': height.value,
-      'sequence': sequence.value,
-      'state': state.value,
-      'temperingFeedSequence': temperingFeedSequence.value,
-      'temperingLayoutId': temperingLayoutId.value,
-      'thickness': thickness.value,
-      'width': width.value,
-       body: JSON.stringify(postData),  
+    const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectBigStorageCageDetails',{
+      glassId:glassId.value
     });
     if (response.code == 200) {
-      // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+      tableDataf.value = response.data;
       ElMessage.success(response.message);
-      add.value = false;
-     tableData.value = response.data;
     } else {
-      // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
       ElMessage.error(response.message);
     }
-  } catch (error) {  
-    // 澶勭悊閿欒...  
-    console.error(error);  
-  }  
-}  
-// 娣诲姞
-// const handleConfirm = async () => {
-//   try {
-//     const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', {
-//       'bigStorageCageOutTask.flowCardId': flowCardId.value,
-//       'bigStorageCageOutTask.gap': gap.value,
-//       'bigStorageCageOutTask.glassId': glassId.value,
-//       'bigStorageCageOutTask.glassType': glassType.value,
-//       'bigStorageCageOutTask.height': height.value,
-//       'bigStorageCageOutTask.sequence': sequence.value,
-//       'bigStorageCageOutTask.state': state.value,
-//       'bigStorageCageOutTask.temperingFeedSequence': temperingFeedSequence.value,
-//       'bigStorageCageOutTask.temperingLayoutId': temperingLayoutId.value,
-//       'bigStorageCageOutTask.thickness': thickness.value,
-//       'bigStorageCageOutTask.width': width.value,
-//     }); 
-//     if (response.code == 200) {
-//       // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
-//       ElMessage.success(response.message);
-//       add.value = false;
-//      tableData.value = response.data;
-//     } else {
-//       // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
-//       ElMessage.error(response.msg);
-//     }
-//   } catch (error) {
-//     // 澶勭悊閿欒
-//     console.error(error);
-//   }
-// };
+  } catch (error) {
+  }
+};
 // 鏄惁绂佺敤
 const toggleEnableState = async (row) => {
   const newState = row.enableState === 1 ? 0 : 1;  
-  console.log(row.slot);
-  console.log(row.enableState);
   var url="/cacheVerticalGlass/bigStorageCage/updateStorageCageDisabled?slot="+row.slot + "&enableState=" + newState;
-      console.log(url);
       const response = await request.get(url) 
   if (response.code === 200) {
       ElMessage.success(response.message);
@@ -274,13 +161,22 @@
       ElMessage.error(response.message);
       }  
   row.enableState = newState;  
-};
-// const tableData = ref([  
-//   // ...鎮ㄧ殑琛ㄦ牸鏁版嵁  
-//   id: 
-//   deviceId slot enableState remainWidth
-
-// ]);  
+}; 
+// 鏄惁鐮存崯
+const broken = async (row) => {
+  try  {
+  const newState = row.isDamage === 1 ? 0 : 1;
+  const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/bigStorageGlassDamageByGlassId', { glassId: row.glassId });  
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+    } else {
+      ElMessage.error(response.message);
+    }
+  row.isDamage = newState;   
+}
+catch (error) {
+  }
+}
  // 鍒犻櫎 
  const opena = async(row) => {  
   try {
@@ -293,20 +189,16 @@
         type: 'warning',  
       } 
     ); 
-    if (confirmResult === 'confirm') {  
-      // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
+    if (confirmResult === 'confirm') {
       const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/deleteBigStorageCageDetails",row)
     if (response.code === 200) {
-      ElMessage.success(response.message);
-      } else {  
-        // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
+     tableDataa.value = response.data;
+     ElMessage.success(response.message);
+      } else {
       ElMessage.error(response.message);
-        // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message); 
       }  
     }  
-  } catch (error) {  
-    // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑  
-    console.error('鍙戠敓閿欒:', error);  
+  } catch (error) {
   }  
 }; 
  // 鐮存崯
@@ -322,25 +214,23 @@
       } 
     ); 
     if (confirmResult === 'confirm') {  
-      // const dataToSend = {  
-      //   ...row,
-      //   status: 0 
-      // };  
-      // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
-      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+0, row)
+      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+8, row)
     if (response.code === 200) {
-      ElMessage.success(response.message);
+     tableDataa.value = response.data;
+     ElMessage.success(response.message);
       } else {  
-        // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.message);
-        // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message); 
       }  
     }  
-  } catch (error) {  
-    // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑  
-    console.error('鍙戠敓閿欒:', error);  
+  } catch (error) {
   }  
 }; 
+// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+  blindb.value = true;
+  iframeUrl.value = `${window.location.origin}/#/Slicecage/slicecagehistory`;
+};
  // 鎷胯蛋
  const brokec = async(row) => {  
   try {
@@ -354,23 +244,15 @@
       } 
     ); 
     if (confirmResult === 'confirm') {  
-      // const dataToSend = {  
-      //   ...row,
-      //   status: 1
-      // };  
-      // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
-      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+1, row)
+      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+9, row)
     if (response.code === 200) {
-      ElMessage.success(response.message);
+     tableDataa.value = response.data;
+     ElMessage.success(response.message);
       } else {  
-        // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.message);
-        // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message); 
       }  
     }  
-  } catch (error) {  
-    // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑  
-    console.error('鍙戠敓閿欒:', error);  
+  } catch (error) {
   }  
 }; 
  // 鍑虹墖
@@ -385,20 +267,15 @@
         type: 'warning',  
       } 
     ); 
-    if (confirmResult === 'confirm') {  
-      // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
+    if (confirmResult === 'confirm') {
       const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/outBigStorageCageDetails", row)
     if (response.code === 200) {
       ElMessage.success(response.message);
       } else {  
-        // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.message);
-        // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message); 
       }  
     }  
-  } catch (error) {  
-    // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑  
-    console.error('鍙戠敓閿欒:', error);  
+  } catch (error) {
   }  
 }; 
  // 鍑虹墖闃熷垪鐮存崯
@@ -414,23 +291,114 @@
       } 
     ); 
     if (confirmResult === 'confirm') {  
-      // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
-      // const dataToSend = {  
-      //   ...row,
-      //   status: 0
-      // };  
-      const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+0, row)
+      const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+8, row)
     if (response.code === 200) {
       ElMessage.success(response.message);
       } else {  
-        // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.message);
-        // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message); 
       }  
     }  
-  } catch (error) {  
-    // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑  
-    console.error('鍙戠敓閿欒:', error);  
+  } catch (error) {
+  }  
+}; 
+ // 鎸囧畾閽㈠寲
+ const brokee = async(row,temperingFeedSequence) => {  
+  try {
+    const confirmResult = await ElMessageBox.confirm(  
+      t('searchOrder.specifytemperinga'), 
+      t('searchOrder.prompt'),  
+      {  
+        confirmButtonText: t('searchOrder.yes'), 
+        cancelButtonText: t('searchOrder.cancel'),
+        type: 'warning',  
+      } 
+    ); 
+    if (confirmResult === 'confirm') {  
+      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/TemperingGlass",{
+        engineerId: row.engineerId,
+        temperingLayoutId: row.temperingLayoutId,
+        temperingFeedSequence:temperingFeedSequence
+    });
+    if (response.code === 200) {
+      ElMessage.success(response.message);
+      } else {  
+      ElMessage.error(response.message);
+      }  
+    }  
+  } catch (error) {
+  }  
+  handleganghua();
+}; 
+ // 鎸囧畾宸ョ▼
+ const brokek = async(row) => {  
+  try {
+    const confirmResult = await ElMessageBox.confirm(  
+      t('searchOrder.specifytemperinga'), 
+      t('searchOrder.prompt'),  
+      {  
+        confirmButtonText: t('searchOrder.yes'), 
+        cancelButtonText: t('searchOrder.cancel'),
+        type: 'warning',  
+      } 
+    ); 
+    if (confirmResult === 'confirm') {
+      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId?engineerId=" + row.engineerId);
+    if (response.code === 200) {
+      ElMessage.success(response.message);
+      } else {  
+      ElMessage.error(response.message);
+      }  
+    }  
+  } catch (error) {
+  }  
+}; 
+// 鍙栨秷鎸囧畾
+const broked = async() => {  
+  try {
+    const confirmResult = await ElMessageBox.confirm(  
+      t('searchOrder.specifytemperinga'), 
+      t('searchOrder.prompt'),  
+      {  
+        confirmButtonText: t('searchOrder.yes'), 
+        cancelButtonText: t('searchOrder.cancel'),
+        type: 'warning',  
+      } 
+    ); 
+    if (confirmResult === 'confirm') {  
+      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/cancelTemperingTask");
+    if (response.code === 200) {
+      ElMessage.success(response.message);
+      } else {  
+      ElMessage.error(response.message);
+      }  
+    }  
+  } catch (error) {
+  }  
+}; 
+ // 鎸囧畾娴佺▼鍗�
+ const brokes = async(row) => {  
+  try {
+    const confirmResult = await ElMessageBox.confirm(  
+      t('searchOrder.specifytemperinga'), 
+      t('searchOrder.prompt'),  
+      {  
+        confirmButtonText: t('searchOrder.yes'), 
+        cancelButtonText: t('searchOrder.cancel'),
+        type: 'warning',  
+      } 
+    ); 
+    if (confirmResult === 'confirm') { 
+      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointFlowCard",{
+        flowCardId: row.flow_card_id,
+        layer: row.layer,
+    });
+    if (response.code === 200) {
+      ElMessage.success(response.message);
+      } else {  
+      ElMessage.error(response.message);
+      }  
+    }  
+  } catch (error) {
   }  
 }; 
 // 鍑虹墖闃熷垪鎷胯蛋
@@ -446,23 +414,14 @@
       } 
     ); 
     if (confirmResult === 'confirm') {  
-      // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
-      // const dataToSend = {  
-      //   ...row,
-      //   status: 1
-      // };  
-      const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+1, row)
+      const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+9, row)
     if (response.code === 200) {
       ElMessage.success(response.message);
       } else {  
-        // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.message);
-        // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message); 
       }  
     }  
-  } catch (error) {  
-    // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑  
-    console.error('鍙戠敓閿欒:', error);  
+  } catch (error) {
   }  
 }; 
 // 鍑虹墖闃熷垪鍒犻櫎
@@ -478,7 +437,6 @@
       } 
     ); 
     if (confirmResult === 'confirm') {  
-      // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
       const dataToSend = {  
         ...row,
         status: 1
@@ -487,14 +445,10 @@
     if (response.code === 200) {
       ElMessage.success(response.message);
       } else {  
-        // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.message);
-        // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message); 
       }  
     }  
-  } catch (error) {  
-    // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑  
-    console.error('鍙戠敓閿欒:', error);  
+  } catch (error) {
   }  
 }; 
 // 瀹屾垚浠诲姟
@@ -510,79 +464,616 @@
       } 
     ); 
     if (confirmResult === 'confirm') {  
-      // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
-      // const dataToSend = {  
-      //   ...row,
-      //   status: 1
-      // };  
       const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/finishBigStorageCageDetails", row)
     if (response.code === 200) {
       ElMessage.success(response.message);
       } else {  
-        // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.message);
-        // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message); 
       }  
     }  
-  } catch (error) {  
-    // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑  
-    console.error('鍙戠敓閿欒:', error);  
+  } catch (error) {
   }  
 }; 
+// 纭娣诲姞
+const finisha = async(row) => {  
+  try {
+    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 = {  
+        ...row,
+        deviceId: deviceId,
+        slot: slot
+      };  
+  const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", 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);
+      }  
+    }  
+  } catch (error) {
+  }  
+};
+const handleganghua = () => {
+  dialogFormVisiblec.value = true;
+  fetchFlow(); 
+};
+const handlexiang = () => {
+  isLoading.value = true;  // 寮�鍚姞杞界姸鎬�
+  dialogFormVisiblea.value = true;
+  fetchxiang(); 
+  currentPage2.value = 1;
+  window.localStorage.setItem('pagenumber', currentPage2.value)
+  filmsId.value = ''
+  flowCardId.value = ''
+};
+// 缂虹墖鏁伴噺
+const handlelack = (row) => {
+  const { engineerId, temperingLayoutId } = row;
+  fetchlack(engineerId, temperingLayoutId); 
+  dialogFormVisibled.value = true;
+};
+// 绗煎唴璇︽儏
+const handlecagedetails = (row) => {
+  const { engineerId, temperingLayoutId } = row;
+  fetchcagedetails(engineerId, temperingLayoutId); 
+  dialogFormVisiblef.value = true;
+};
+// 璀︽姤鍙屽嚮寮圭獥
+const handleDoubleClick = () => {
+  showModal.value = true;
+};
+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');
+};
+// 閽㈠寲鏌ヨ
+onMounted(async () => {  
+  try {  
+    var url="/cacheVerticalGlass/bigStorageCageDetails/selectTemperingGlass?isTempering="+1;
+    const response = await request.post(url)
+    if (response.code === 200) {  
+      ElMessage.success(response.message);
+      tableDatagh.value = response.data
+    } else {  
+      ElMessage.warning(response.msg)
+    }  
+  } catch (error) {
+  }
+}); 
+// 鐞嗙墖绗间俊鎭�
+const fetchxiang = async () => {
+    isLoading.value = true;
+  try {
+    const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/queryVerticalSheetCageDetailsList',{
+        // deviceId: page,
+        engineerId: engineerId.value,
+        filmsId: filmsId.value,
+        flowCardId: flowCardId.value,
+        glassId: glassId.value,
+        thickness: -1,
+    })
+    // 妯℃嫙鏈�灏忓姞杞芥椂闂�
+    await new Promise(resolve => setTimeout(resolve, 300));
+    if (response.code === 200) {
+      ElMessage.success(response.message);
+      tableDataa.value = response.data
+    } else {  
+      ElMessage.warning(response.msg)
+    }  
+  } catch (error) {
+  } finally {
+    isLoading.value = false;
+  }
+
+}
+const fetchxianga = async () => {
+  let page = window.localStorage.getItem('pagenumber')
+  try {     
+    const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/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) {  
+      ElMessage.success(response.message);
+      tableDataa.value = response.data
+      // filmsId.value = ''
+      // flowCardId.value = ''
+    } else {  
+      ElMessage.warning(response.msg)
+    }  
+  } catch (error) {
+  } 
+}
+// 闈為挗鍖栨祦绋嬪崱
+const fetchFlows = async () => {
+  try {  
+    var url="/cacheVerticalGlass/bigStorageCageDetails/selectTemperingGlass?isTempering="+0;
+    const response = await request.post(url)
+    if (response.code === 200) {  
+      ElMessage.success(response.message);
+      tableDatas.value = response.data
+    } else {  
+      ElMessage.warning(response.msg)
+    }  
+  } catch (error) {
+  } 
+}
+// 缂虹墖鏁伴噺
+const fetchlack = async (engineerId, temperingLayoutId) => {
+  try  {
+    const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/queryLackGlassInfo',{
+        engineerId: engineerId,
+        temperingLayoutId: temperingLayoutId,
+    })
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      tableDatalack.value = response.data
+    } else {
+      ElMessage.error(response.message);
+    }
+}
+catch (error) {
+    // 澶勭悊閿欒
+  }
+}
+// 绗煎唴璇︽儏
+const fetchcagedetails = async (engineerId, temperingLayoutId) => {
+  try  {
+    const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/queryRealGlassInfo',{
+        engineerId: engineerId,
+        temperingLayoutId: temperingLayoutId,
+    })
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      tableDatacagedetails.value = response.data
+    } else {
+      ElMessage.error(response.message);
+    }
+}
+catch (error) {
+  }
+}
+const fetchFlow = async () => {
+  try  {
+    var url="/cacheVerticalGlass/bigStorageCageDetails/selectTemperingGlass?isTempering="+1;
+    const response = await request.post(url)
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      tableDatagh.value = response.data
+      temperingtotal.value = response.data.length
+      let totalCount = 0;
+      let fullCount = 0;
+      response.data.forEach(item => { 
+        totalCount += item.realCount || 0;
+        if(item.lackCount==0){
+          fullCount+=1;
+        }
+      });
+      glasstotal.value = totalCount;
+      fulltotals.value = fullCount;
+ 
+    } else {
+      ElMessage.error(response.message);
+    }
+}
+catch (error) {
+  }
+}
 function handleRowClick(row) {  
   selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁  
 }  
-
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
-const handleMessage = (data) => {
-  // 鏇存柊 tableData 鐨勬暟鎹�
-  tableDatac.value = data.bigStorageCageDetailsOutTask[0]
-  tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
-  tableData.value = data.bigStorageCageInfo[0]
-  tableDatab.value = data.temperingGlassInfoList[0]
-  tableDatae.value = data.bigStorageCageUsage[0]
-  // adjustedRects.value = data.bigStorageCageInfo1[0]
-  adjustedRects.value = data.bigStorageCageInfo1[0].map(rect => ({  
-            ...rect, 
-            // width: rect.remainWidth *0.04,
-            top: rect.id *2,
-          })); 
-console.log(data.bigStorageCageInfo1[0]);
-adjustedRectsa.value = data.bigStorageCageInfo2[0].map(rect => ({  
-            ...rect, 
-            // width: rect.remainWidth *0.04,
-            top: rect.id *2,
-          })); 
-  // window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
-  // let length = window.localStorage.getItem('length')
-  
-};
-// function getRectHeight(length: number) {  
-//   return length > 0 ? 29 / length : 29;
-// } 
-// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
-onMounted(() => {
-  // fetchFlowCardId();
-  // fetchTableData(); // 鑾峰彇鏁版嵁
-  initializeWebSocket(socketUrl, handleMessage);
-});
-function getStatusType(enableState: number) {  
-  switch (enableState) {  
-    case 0:
-      return 'warning';  
-    case 1: 
-      return 'success';  
-  }  
-}  
-function getStatusText(enableState: number) {
-  switch (enableState) {
-    case 0:  
-      return t('searchOrder.disable');
-    case 1:  
-      return t('searchOrder.enable'); 
-  }  
+// 閽㈠寲寮�鍏�
+  const handleChange = async () => {
+  try  {
+    const body = {  
+      flag: ganghua.value,
+    }; 
+    
+    var url="/cacheVerticalGlass/bigStorageCageDetails/temperingSwitch?flag="+ganghua.value;
+  const response = await request.post(url)
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      ganghua.value = response.data
+    }else {  
+      ElMessage.error(response.message);
+      }  
 }
+catch (error) {
+  }
+}
+// 璋冨害寮�鍏�
+const handlediaodu = async () => {
+  try  {
+    const body = {  
+      flag: diaodu.value,
+    };
+    var url="/cacheVerticalGlass/bigStorageCageDetails/dispatchSwitch?flag="+diaodu.value;
+  const response = await request.post(url)
+    if (response.code == 200) {
+      ElMessage.success(response.message);
+      diaodu.value = response.data
+    }else {  
+      ElMessage.error(response.message);
+      }  
+}
+catch (error) {
+  }
+}
+// 浠诲姟閲嶇疆
+// 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('/cacheVerticalGlass/bigStorageCage/resetCage')
+//     if (response.code === 200) {
+//       ElMessage.success(response.message);
+//       } else {
+//       ElMessage.error(response.msg);
+//       }  
+//     }  
+//   } catch (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);
+  }
+};
+let socket = null;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
+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.bigStorageSummary!=null){
+    tableDatass.value = data.bigStorageSummary[0]
+  }else{
+    tableDatass.value = ''
+      }
+  if (data.inkageEntity != null) {
+    inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
+  }
+  if (data.requestEntity != null) {
+    requestEntity.value = data.requestEntity == 1 ? 'green' : '#911005';
+  }
+  if (data.mesReplyEntity != null) {
+    mesReplyEntity.value = data.mesReplyEntity == 1 ? 'green' : '#911005';
+  }
+  if (data.outInkageEntity != null) {
+    outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005';
+  }
+  if (data.outRequestEntity != null) {
+    outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
+  }
+    if (data.scanGlass != null) {
+    scanGlass.value = data.scanGlass[0];
+    let width = scanGlass.value.width;
+    let height = scanGlass.value.height;
+    if (width < height) {
+      scanGlass.value.width = height;
+      scanGlass.value.height = width;
+    }
+    if (autoPrint.value == true && browser.value == true) {
+      open1(scanGlass);
+    }
+  }
+  //褰撳墠鎸囧畾宸ョ▼
+  if(data.temperingEngineerId!=null){
+    temperingengineerId.value=data.temperingEngineerId[0];
+  }
+  if(data.bigStorageCageDetailsOutTask!=null){
+    tableDatac.value = data.bigStorageCageDetailsOutTask[0]
+    adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+  } else {
+    tableDatac.value = '',
+    adjusta.value = ''
+  }
+  if(data.bigStorageCageDetailsFeedTask!=null){
+    tableDatax.value = data.bigStorageCageDetailsFeedTask[0]
+  } else {
+    tableDatax.value = ''
+  }
+  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]
+}else{
+    tableDatab.value = ''
+      }
+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.temperingSwitch!=null){
+  ganghua.value = data.temperingSwitch[0]
+}else{
+  ganghua.value = ''
+  }
+if(data.dispatchSwitch!=null){
+  diaodu.value = data.dispatchSwitch[0]
+}else{
+  diaodu.value = ''
+  }
+  if(data.bigStorageCageInfos!=null){
+  adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
+    id: index + 1,
+    height: 20/55,
+    top: 53/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: 53/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: 53/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: 53/55,
+  }));
+subRectsCountsc.value = data.bigStorageCageInfos[0][4].map(rect => rect.count);
+  }else{
+    adjustedRects.value = '',
+    adjustedRectsa.value = '',
+    adjustedRectsb.value = '',
+    adjustedRectsc.value = ''
+  }
+};
+// 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStyle = (rect, index) => ({
+  position: 'absolute',
+  width: '170px',
+  right: '0px',
+  top: `${index*rect.top}px`,
+  height: `${rect.height}px`,
+});
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRects = (rectIndex) => {
+  const count = subRectsCounts.value[rectIndex];
+  const subRects = [];
+  for (let i = 0; i < count; i++) {
+    subRects.push({});
+  }
+  return subRects;
+};
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStyle = (rectIndex, subIndex) => {
+  const width = '18px';
+  const marginRight = '8px';
+  const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+  const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+  return {
+    position: 'absolute',
+    width,
+    height: '100%',
+    marginRight,
+    top: '0px',
+    backgroundColor: '#911005',
+    right,
+  };
+};
+// 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStylea = (rect, index) => ({
+  position: 'absolute',
+  width: '170px',
+  right: '0px',
+  top: `${index*rect.top}px`,
+  height: `${rect.height}px`,
+});
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsa = (rectIndex) => {
+  const count = subRectsCountsa.value[rectIndex];
+  const subRects = [];
+  for (let i = 0; i < count; i++) {
+    subRects.push({});
+  }
+  return subRects;
+};
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStylea = (rectIndex, subIndex) => {
+  const width = '18px';
+  const marginRight = '8px';
+  const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+  const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+  return {
+    position: 'absolute',
+    width,
+    height: '100%',
+    marginRight,
+    top: '0px',
+    backgroundColor: '#911005',
+    right,
+  };
+};
+// 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStyleb = (rect, index) => ({
+  position: 'absolute',
+  width: '170px',
+  right: '0px',
+  top: `${index*rect.top}px`,
+  height: `${rect.height}px`,
+});
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsb = (rectIndex) => {
+  const count = subRectsCountsb.value[rectIndex];
+  const subRects = [];
+  for (let i = 0; i < count; i++) {
+    subRects.push({});
+  }
+  return subRects;
+};
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStyleb = (rectIndex, subIndex) => {
+  const width = '18px';
+  const marginRight = '8px';
+  const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+  const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+  return {
+    position: 'absolute',
+    width,
+    height: '100%',
+    marginRight,
+    top: '0px',
+    backgroundColor: '#911005',
+    right,
+  };
+};
+// 璁$畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStylec = (rect, index) => ({
+  position: 'absolute',
+  width: '170px',
+  right: '0px',
+  top: `${index*rect.top}px`,
+  height: `${rect.height}px`,
+});
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsc = (rectIndex) => {
+  const count = subRectsCountsc.value[rectIndex];
+  const subRects = [];
+  for (let i = 0; i < count; i++) {
+    subRects.push({});
+  }
+  return subRects;
+};
+// 璁$畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStylec = (rectIndex, subIndex) => {
+  const width = '18px';
+  const marginRight = '8px';
+  const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+  const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+  return {
+    position: 'absolute',
+    width,
+    height: '100%',
+    marginRight,
+    top: '0px',
+    backgroundColor: '#911005',
+    right,
+  };
+};
+// 鏍煎紡鍖栧悗绔椂闂村苟璁$畻涓�鍛ㄥ墠鐨勬椂闂�
+const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
+function parseAndSetTime() {
+  const backendTime = new Date(globalDate);
+  const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+  oneWeekAgo.setHours(0, 0, 0, 0);
+  timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
+  window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+}
+  onMounted(() => {
+  socket = initializeWebSocket(socketUrl, handleMessage);
+  parseAndSetTime();
+  selectGong()
+});
+  onUnmounted(() => {
+    if (socket) {
+    closeWebSocket(socket);
+    }
+    });
 function getStatusTypea(ishorizontal: number) {  
   switch (ishorizontal) {  
     case 0:
@@ -617,91 +1108,204 @@
     return t('searchOrder.waiting');
   }  
 }
+function getcasOnea(isSame) {  
+  switch (isSame) {  
+    case 1:
+      return 'danger';  
+    case 0: 
+      return 'info';  
+  }  
+}  
+function getStatuscasOnea(isSame) {
+  switch (isSame) {
+    case 1:  
+      return t('searchOrder.same');
+    case 0:  
+      return t('searchOrder.notsame'); 
+  }  
+}
+function tableRowClassName({ row }) {
+  if (row.isSame === 1) {
+    return 'row-red-background';
+  }
+  return '';
+}
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+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}`;
+}
+const svg = `
+        <path class="path" d="
+          M 30 15
+          L 28 17
+          M 25.61 25.61
+          A 15 15, 0, 0, 1, 15 30
+          A 15 15, 0, 1, 1, 27.99 7.5
+          L 15 15
+        " style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"/>
+      `
 onBeforeUnmount(() => {
-  console.log("鍏抽棴浜�")
   closeWebSocket();
 });
 </script>
- 
 <template>
   <div style="height: 600px;">
-    <el-button style="margin-top: 5px;margin-left: 10px;"   id="searchButton" type="primary" @click="dialogFormVisiblea = true">{{ $t('searchOrder.cageinformation') }}</el-button>
-    <el-button style="margin-top: 5px;margin-left: 10px;"   id="searchButton" type="success" @click="dialogFormVisibleb = true">{{ $t('searchOrder.productionqueue') }}</el-button>
-    <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
-      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
-        <el-table height="100%" ref="table" 
-        :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-          <el-table-column prop="bigStorageCageOutTask.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="100" />
-          <el-table-column prop="bigStorageCageOutTask.startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
-          <el-table-column prop="bigStorageCageOutTask.endSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
-          <el-table-column prop="bigStorageCageOutTask.trainNumber" align="center" :label="$t('searchOrder.trips')" min-width="120" />
-          <el-table-column prop="bigStorageCageOutTask.serialNumber" align="center" :label="$t('searchOrder.number')" min-width="120" />
-          <el-table-column prop="bigStorageCageOutTask.taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157">
-          <template #default="scope">  
-            <el-tag type="success" >{{ scope.row.bigStorageCageOutTask.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
-          </template>
-          </el-table-column>
-          <el-table-column prop="id" align="center" :label="$t('searchOrder.tabid')" min-width="150"/>
-          <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/>
-          <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/>
-          <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="100"/>
-          <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/>
-          <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="100"/>
-          <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/>
-          <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="100"/>
-          <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="100"/>
-          <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="100"/>
-          <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="100"/>
-          <el-table-column fixed="right" :label="$t('searchOrder.endtask')" align="center" width="150">
-            <template #default="scope">
-              <el-button size="mini" type="text" plain @click="finish(scope.row)">{{ $t('searchOrder.completetask') }}</el-button>
-            </template>
-        </el-table-column>
-        </el-table>
-      </div>
+    <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>
+    </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>
+    <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="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
+    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisibles=true;fetchFlows()">{{ $t('searchOrder.searchlayout') }}</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="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
+    <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
+    <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>
+<!-- // 鐖剁骇妗� -->
+<div class="img-dlpl" >
+    <div class="img-car1" :style="'z-index:999;left:240px;top:' + 350*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:630px;top:' + 350*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: 53px;position: relative;top:63px;left: 445px;">
+      <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: 53px;position: relative;top:72px;left: 445px;">
+    <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: 53px;position: relative;top:81px;left: 445px;">
+    <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: 53px;position: relative;top:89px;left: 445px;">
+    <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>
+</div>
+<el-card style="flex: 1;margin-left: 1074px;margin-top: -410px;">
+      <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
+       <el-table height="370px" ref="table" border 
+       :data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+         <el-table-column fixed prop="engineerId" align="center" :label="$t('Mounting.project')" min-width="100" />
+         <el-table-column prop="countTemp" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="68" />
+         <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.furnaces')" min-width="82" />
+         <el-table-column prop="countGlass" align="center" :label="$t('searchOrder.cagesnumber')" min-width="82" />
+         <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="65" />
+         <el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="95" />
+         <el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="75" />
+       </el-table>
+       </div>
     </el-card>
-    <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;" v-loading="loading">
-      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
-        <el-table height="100%" ref="table" 
-        @selection-change="handleSelectionChange"
-        :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-          <el-table-column prop="bigStorageCageFeedTask.glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="100" />
-          <el-table-column prop="bigStorageCageFeedTask.targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
-          <!-- <el-table-column prop="task_type" align="center" label="浠诲姟绫诲瀷" min-width="120" />娌℃湁杩斿洖瀛楁 -->
-          <el-table-column prop="bigStorageCageFeedTask.taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="120">
-          <template #default="scope">
-            <el-tag type="success" >{{ scope.row.bigStorageCageFeedTask.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
-          </template>
-          </el-table-column>
-          <el-table-column prop="bigStorageCageFeedTask.line" align="center" :label="$t('searchOrder.line')" min-width="120" />
-          <el-table-column prop="id" align="center" :label="$t('searchOrder.tabid')" min-width="150"/>
-          <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/>
-          <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/>
-          <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="100"/>
-          <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/>
-          <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="100"/>
-          <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/>
-          <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="100"/>
-          <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="100"/>
-          <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="100"/>
-          <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="100"/>
-          <el-table-column fixed="right" :label="$t('searchOrder.endtask')" align="center" width="150">
-            <template #default="scope">
-              <el-button size="mini" type="text" plain @click="finish(scope.row)">{{ $t('searchOrder.completetask') }}</el-button>
-            </template>
-        </el-table-column>
-        </el-table>
-      </div>
-    </el-card>
-    <div style="padding: 10px;display: flex;height:110px;">
+<div style="padding: 10px;display: flex;height:130px;margin-top:1px">
             <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>  
+                 <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;">  
@@ -709,250 +1313,123 @@
                </el-col>  
              </div>  
     </div>
-    <!-- <div id="awatch">
-  <img src="../../assets/cp.png" alt="" style="width: 70%;height: 70%;margin-left: 160px;">
-</div> -->
-<!-- // 鐖剁骇妗� -->
-<div class="img-dlpl" >
-    <div class="img-car1" :style="'z-index:999;left:247px;top:' + carposition1 + 'px;position:absolute;'">
-      <div v-show="cellshow1" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
-    </div>
-    <div v-show="c1" class="img-car2" :style="'z-index:999;left:704px;top:' + carposition2 + 'px;position:absolute;'">
-      <div v-show="cellshow2" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
-    </div>
-    
-    <div v-show="c2" class="img-car3" :style="'z-index:999;left:247px;top:' + carposition3 + 'px;position:absolute;'">
-      <div v-show="cellshow3" style="margin-top:10px;width:220px;height:5px;background-color:#409EFF;"></div>
-    </div>
-    <div class="img-car4" :style="'z-index:999;left:704px;top:' + carposition4 + 'px;position:absolute;'">
-      <div v-show="cellshow4" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
-    </div>
-    <div v-show="cell1" style="width: 227px;position: relative;height: 29px;top:55px;left: 465px;background-color: #911005;">
-      <div  
-      v-for="(rect, index) in adjustedRects"  
-      :key="rect"  
-      :style="{
-       position: 'absolute',
-       width: '227px',
-       height: '0.8px',
-       backgroundColor: '#409EFF',
-       left: '0px',
-       top: `${rect.top}px`,
-       }"  
-    >
-   
-    </div>
-    </div>
- <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:86px;left: 465px;background-color: #911005;">
-  <div  
-      v-for="(rect, index) in adjustedRectsa"  
-      :key="rect"  
-      :style="{
-       position: 'absolute',
-       width: '227px',
-       height: '0.8px',
-       backgroundColor: '#409EFF',
-       left: '0px',
-       top: `${rect.top}px`,
-       }"  
-    >
-   
-    </div>
-    </div>
-      <!--  <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:117px;left: 465px;background-color: #409EFF;">
-    </div>
-  <div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:148px;left: 465px;background-color: #409EFF;">
-    </div>
-  <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:208px;left: 465px;background-color: #409EFF;">
-    </div>
-  <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:238px;left: 465px;background-color: #409EFF;">
-    </div>
-  <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:269px;left: 465px;background-color: #409EFF;">
-    </div>
-  <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;background-color: #409EFF;">
-    </div> -->
-</div>
+    <div class="table-container">
+    <el-card style="flex: 1;margin-left: 10px;margin-top: 3px;">
+      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
+       <el-table height="200px" ref="table" 
+        :row-class-name="tableRowClassName"
+        :data="tableDatax" :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="200px" 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>
+            </el-card>
   </div>
-  <el-dialog v-model="add" top="10vh" width="65%" :title="$t('searchOrder.addcage')" >
-      <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
-          <el-input :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
-          </el-input>
-          <el-button type="primary" plain style="margin-left: 10px;">{{ $t('searchOrder.search') }}</el-button>
-        
-        <!-- <span style="margin-right: 10px">绂佺敤璇�</span>
-        <el-input clearable placeholder="璇疯緭鍏ョ鐢ㄨ瘝" size="mini" 
-          style="margin-right: 50px; width: 200px;" /> -->
-        </div>
-    <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
-            <el-form  size="mini" label-width="180px">
-      <el-form label-width="180px" label-position="right">
+  </div>
+    
+  <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="6">
+          <el-col :span="4">
               <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.glassIDa')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.inglassID')" v-model="glassId" autocomplete="off" />
+              <el-form-item :label="$t('searchOrder.tida')"  style="width: 14vw">
+                {{ currentRow.deviceId }}
               </el-form-item>
-              </div></div>
+              </div>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="5">
             <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.pieceingrida')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.inpieceingrid')" v-model="sequence" autocomplete="off" />
-              </el-form-item></div>
+          <el-form-item :label="$t('searchOrder.gridnumbera')" style="width: 14vw">
+                {{ currentRow.slot }}
+              </el-form-item>
               </div>
           </el-col>
         </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.cardnumbera')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.incardnumber')" v-model="flowCardId" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.typeglassa')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.intypeglass')" v-model="glassType" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.widtha')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.inwidth')" v-model="width" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.heighta')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.inheight')" v-model="height" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.thicknessa')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.inthickness')" v-model="thickness" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.layoutIDa')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.inlayoutID')" v-model="temperingLayoutId" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.picturesequencea')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.inpicturesequence')" v-model="temperingFeedSequence" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.startstatusa')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.instartstatus')" v-model="state" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: 10px;">
-          <el-col :span="6">
-              <div id="dt" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.glassgapsa')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.inglassgaps')" v-model="gap" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-          <el-col :span="9">
-            <div id="dta" style="font-size: 15px;">
-        <div>
-          <el-form-item :label="$t('searchOrder.gridnumbera')" :required="true" style="width: 24vw;">
-                <el-input :placeholder="$t('searchOrder.grid')" v-model="state" autocomplete="off" />
-              </el-form-item></div></div>
-          </el-col>
-        </el-row>
-        </el-form>
-            </el-form>
-          </div>
-    <template #footer>
-      <div id="dialog-footer">
-        <el-button type="primary" @click="handleConfirm">
-          {{ $t('searchOrder.sure') }}
-        </el-button>
-        <el-button @click="add = false">{{ $t('searchOrder.cancel') }}</el-button>
-      </div>
-    </template>
-  </el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="5vh" width="97%" :title="$t('searchOrder.cageinformation')">
-    <el-table  
-          :data="tableData" 
-          @row-click="handleRowClick" 
-          height="500"
-          @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.bigStorageCageDetails && props.row.bigStorageCageDetails.length">  
-                <el-table  
-                  :data="props.row.bigStorageCageDetails"  
-                  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="80"/>  
-          <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="100" />
-          <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="120" />
-          <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-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>
+    <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"
+          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-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="80" />
-           <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center"  min-width="220">
+          <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="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>
-              <el-button size="mini" type="text" plain @click="outfil(scope.row)">{{ $t('searchOrder.outfilm') }}</el-button>
+              <el-button type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</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>
+      </div>
+  </el-dialog>
+  <el-dialog v-model="dialogFormVisiblea" top="2vh" width="95%" 
+  :title="$t('searchOrder.cageinformation')">
+  <div v-loading="isLoading" class="loading-container" :element-loading-text="$t('searchOrder.loadingText')" >
+  <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>
+    <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="100" />
+          <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="50" />
           <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
           <el-table-column
           align="center"
@@ -970,88 +1447,276 @@
         </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">
+          <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="120"/>
+          <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 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>
+              <!-- <el-button type="text" 
+              :disabled="!((props.row.bigStorageCageDetails[0].state !== 102 && scope.$index == 0 ) || (props.row.bigStorageCageDetails[(scope.$index - 1)<0?0:scope.$index-1].state==102)&&(scope.row.state!=102))"
+               plain @click="outfil(scope.row)">
+               {{ $t('searchOrder.outfilm') }}
+              </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="40"
+          :current-page.sync="currentPage2"
+          @current-change="handlePageChange2"
+        />
+    </div> -->
+  </div>
+  </div>
+  </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>
+<!-- 閽㈠寲鏌ヨ -->
+<el-dialog v-model="dialogFormVisiblec" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
+  <div style="margin-bottom: 20px">
+      <el-form>
+        <el-row style="margin-top: -15px;margin-bottom: -2px;">
+          <el-col :span="2">
+              <div id="dt" style="font-size: 15px;">
+              <el-form-item :label="$t('searchOrder.temperingtotal')"  style="width: 14vw">
+                {{ temperingtotal }}
+              </el-form-item>
+              </div>
+          </el-col>
+          <el-col :span="5">
+            <div id="dta" style="font-size: 15px;">
+          <el-form-item :label="$t('searchOrder.glasstotal')" style="width: 14vw">
+                {{ glasstotal }}
+              </el-form-item>
+              </div>
+          </el-col>
+          <el-col :span="4">
+              <div id="dt" style="font-size: 15px;">
+              <el-form-item :label="$t('searchOrder.fullfurnaces')" style="width: 14vw">
+                {{ fulltotals }}
+              </el-form-item>
+              </div>
+          </el-col>
+          <el-col :span="4">
+              <div id="dt" style="font-size: 15px;">
+              <el-form-item :label="$t('searchOrder.specifiedproject')" style="width: 14vw">
+                {{ temperingengineerId }}
+              </el-form-item>
+              </div>
+          </el-col>
+          <el-col :span="4">
+              <div id="dt" style="font-size: 15px;">
+                <el-button type="text" plain @click="broked()">{{ $t('searchOrder.undesignate') }}</el-button>
+              </div>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <el-table  ref="table" style="margin-top: 20px;height: 500px;"
+        :data="tableDatagh" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+          <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+          <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
+          <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
+          <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
+          <el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
+          <el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
+          <el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
+          <el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
+          <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
             <template #default="scope">
-              <el-button size="mini" type="text" plain  @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
+              <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+              <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+              <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+              <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
+              <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
             </template>
         </el-table-column>
         </el-table>
-        <div id="demo-pagination-block">
-    <el-pagination
-    style="margin-left: 850px;"
-      v-model:current-page="currentPage4"
-      v-model:page-size="pageSize4"
-      :page-sizes="[100, 200, 300, 400]"
-      :small="small"
-      :disabled="disabled"
-      :background="background"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="400"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-  </div>
 </el-dialog>
-<el-dialog v-model="dialogFormVisibleb" top="5vh" width="85%" :title="$t('searchOrder.productionqueue')">
-  <!-- <div style="display: flex;">
-  <p style="margin-top: 3px;">闃熷垪鐘舵�侊細</p>
-  <p style="margin-top: 3px;">寮�濮�</p>
-    <el-button style="margin-left: 10px;size: mini;" type="danger">鍋滄</el-button>
-    <el-button style="margin-left: 10px;size: mini;" type="primary">娣诲姞</el-button>
-  </div> -->
-    <el-table  ref="table" style="margin-top: 20px;height: 500px;"
-        :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-          <el-table-column prop="id" fixed align="center" :label="$t('searchOrder.sheetID')" min-width="150"/>
-          <el-table-column prop="flowcardId" fixed align="center" :label="$t('searchOrder.processcards')" min-width="120" />
-          <el-table-column prop="glassType" align="center" :label="$t('searchOrder.processcardtype')" min-width="150" />
+<el-dialog v-model="dialogFormVisibled" top="5vh" width="85%" :title="$t('hellow.missingnumber')">
+    <el-table  ref="table" style="margin-top: 20px;height: 600px;"
+        :data="tableDatalack" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+          <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+          <el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+          <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150" />
+          <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+          <el-table-column prop="temperingFeedSequence" fixed align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
           <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="filmsid" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
           <el-table-column
             align="center"
-            :label="$t('searchOrder.acceptshorizontal')"
-            min-width="150"
-            prop="ishorizontal"
+            :label="$t('searchOrder.state')"
+            min-width="80"
+            prop="isDamage"
           >
-          <template #default="scope">  
-        <el-tag :type="getStatusTypea(scope.row.ishorizontal)">  
-          {{ getStatusTexta(scope.row.ishorizontal) }}  
-        </el-tag>  
-      </template> 
+            <template #default="scope">
+              <div 
+                @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+                style="position: relative; display: inline-block;"
+              >
+                <el-tag
+                  :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+                  style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+                >
+                  {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+                </el-tag>
+                <div 
+                  v-if="scope.row.isDamage === 1"
+                  style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+                ></div>
+              </div>
+            </template>
           </el-table-column>
-          <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="120" />
-          <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
-          <el-table-column prop="xCoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
-          <el-table-column prop="yCoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
-          <el-table-column prop="angle" align="center" :label="$t('searchOrder.rotationangle')" min-width="150" />
+          <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+          <el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+          <el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
+        </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisiblee" top="5vh" width="85%" :title="$t('searchOrder.specifyengineerid')">
+    <el-table  ref="table" style="margin-top: 20px;height: 600px;"
+        :data="tableDataspecify" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+          <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+          <el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+          <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150" />
+          <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+          <el-table-column prop="temperingFeedSequence" fixed align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
+          <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="filmsid" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
           <el-table-column
             align="center"
             :label="$t('searchOrder.state')"
             min-width="80"
-            prop="state"
+            prop="isDamage"
           >
-          <template #default="scope">  
-        <el-tag :type="getStatusTypeb(scope.row.state)">  
-          {{ getStatusTextb(scope.row.state) }}  
-        </el-tag>  
-      </template> 
-          </el-table-column>
-          <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
             <template #default="scope">
-              <el-button size="mini" type="text" plain @click="brokea(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
-              <el-button size="mini" type="text" plain @click="brokeb(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
-              <el-button size="mini" type="text" plain @click="deletea(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
+              <div 
+                @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+                style="position: relative; display: inline-block;"
+              >
+                <el-tag
+                  :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+                  style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+                >
+                  {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+                </el-tag>
+                <div 
+                  v-if="scope.row.isDamage === 1"
+                  style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+                ></div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+          <el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+          <el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
+        </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisiblef" top="5vh" width="85%" :title="$t('searchOrder.cagedetails')">
+    <el-table  ref="table" style="margin-top: 20px;height: 600px;"
+        :data="tableDatacagedetails" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+          <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+          <el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+          <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150" />
+          <el-table-column prop="slot" fixed align="center" :label="$t('film.slot')" min-width="150" />
+          <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+          <el-table-column prop="temperingFeedSequence" fixed align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
+          <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="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+          <el-table-column
+            align="center"
+            :label="$t('searchOrder.state')"
+            min-width="80"
+            prop="isDamage"
+          >
+            <template #default="scope">
+              <div 
+                @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+                style="position: relative; display: inline-block;"
+              >
+                <el-tag
+                  :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+                  style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+                >
+                  {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+                </el-tag>
+                <div 
+                  v-if="scope.row.isDamage === 1"
+                  style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+                ></div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+          <el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+          <el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
+        </el-table>
+</el-dialog>
+<!-- 闈為挗鍖� -->
+<el-dialog v-model="dialogFormVisibles" top="5vh" width="85%" :title="$t('searchOrder.searchlayout')">
+  <el-table  ref="table" style="margin-top: 20px;height: 500px;"
+        :data="tableDatas" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+          <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+          <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
+          <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
+          <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
+          <el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
+          <el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
+          <el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
+          <el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
+          <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
+            <template #default="scope">
+              <el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+              <el-button type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
+              <el-button type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+              <el-button type="text" plain @click="handlelack(scope.row)">{{ $t('hellow.missingnumber') }}</el-button>
+              <el-button type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
             </template>
         </el-table-column>
         </el-table>
+    <!-- <el-table  ref="table" style="margin-top: 20px;height: 500px;"
+        :data="tableDatas" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+          <el-table-column prop="flow_card_id" fixed align="center" :label="$t('searchOrder.processcards')"/>
+          <el-table-column prop="layer" align="center" :label="$t('searchOrder.ceng')" />
+          <el-table-column prop="count" align="center" :label="$t('searchOrder.numberglasses')" />
+          <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" >
+            <template #default="scope">
+              <el-button type="text" plain @click="brokes(scope.row)">{{ $t('searchOrder.processcard') }}</el-button>
+            </template>
+        </el-table-column>
+        </el-table> -->
 </el-dialog>
- 
 </template>
-<style scoped>
- 
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+<style>
+#dt { display:block; float:left;line-height: 20px;margin-left: 150px;}
 #dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
 #dialog-footer{
   text-align: center;
@@ -1098,18 +1763,15 @@
      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{
   position: absolute;
@@ -1118,7 +1780,6 @@
   top:20rem;
   right: 57rem;
   z-index: 10;
-  
 }
 .check-imga{
   position: absolute;
@@ -1127,7 +1788,6 @@
   top:15rem;
   right: 28.5rem;
   z-index: 10;
-  
 }
 .vertical {
     width: 45px;
@@ -1138,7 +1798,6 @@
     transform: translateX(-50%);
     animation: move-vertical 6s infinite; /* 浠庝笂鍒颁笅鍔ㄧ敾锛屾寔缁�6绉掞紝鏃犻檺寰幆 */
 }
- 
 @keyframes move-vertical {
     0% {
         top: 485px; /* 璧峰浣嶇疆 */
@@ -1147,65 +1806,111 @@
         top: calc(100% - 210px); /* 浠庝笂鍒颁笅缁撴潫浣嶇疆 */
     }
 }
- 
 .img-dlpl{
-  margin-left: 80px;
-  background-image:url('../../assets/dlpl.png');
+  margin-left: 20px;
+  margin-top: 0px;
+  background-image:url('/ganghuaqian.png');
   background-repeat: no-repeat;
-    background-attachment: local;
-    min-height: 400px;
-    width: 1200px;
-    max-width: 100%;
-    background-size: 1200px 400px;
-    overflow: hidden;
-    position:relative
+  background-attachment: local;
+  min-height: 380px;
+  width: 1050px;
+  max-width: 100%;
+  background-size: 1050px 380px;
+  overflow: hidden;
+  position:relative
 }
 .img-car1{
-  background-image:url('../../assets/lp.png');
+  display: flex;
+  background-image:url('/xiaoche.png');
   position: absolute;
   background-repeat: no-repeat;
-    background-attachment: local;
-    min-height: 200px;
-    width: 200px;
-    max-width: 100%;
-    background-size: 200px 70px;
-    overflow: hidden;
-    position:relative
-}
-.img-car2{
-  background-image:url('../../assets/lpa.png');
-  position: absolute;
-  background-repeat: no-repeat;
-    background-attachment: local;
-    min-height: 200px;
-    width: 200px;
-    max-width: 100%;
-    background-size: 200px 70px;
-    overflow: hidden;
-    position:relative
-}
-.img-car3{
-  background-image:url('../../assets/lp.png');
-  position: absolute;
-  background-repeat: no-repeat;
-    background-attachment: local;
-    min-height: 200px;
-    width: 200px;
-    max-width: 100%;
-    background-size: 200px 70px;
-    overflow: hidden;
-    position:relative
+  background-attachment: local;
+  min-height: 200px;
+  width: 200px;
+  max-width: 100%;
+  background-size: 200px 70px;
+  overflow: hidden;
+  position:relative
 }
 .img-car4{
-  background-image:url('../../assets/lpa.png');
+  display: flex;
+  background-image:url('/xiaoche.png');
   position: absolute;
   background-repeat: no-repeat;
-    background-attachment: local;
-    min-height: 200px;
-    width: 200px;
-    max-width: 100%;
-    background-size: 200px 70px;
-    overflow: hidden;
-    position:relative
+  background-attachment: local;
+  min-height: 200px;
+  width: 200px;
+  max-width: 100%;
+  background-size: 200px 70px;
+  overflow: hidden;
+  position:relative
+}
+.table-container {
+  display: flex;
+  flex-wrap: nowrap; /* 闃叉鎹㈣ */
+  justify-content: space-between; /* 鏍规嵁闇�瑕佽皟鏁村瓙鍏冪礌涔嬮棿鐨勯棿璺� */
+}
+.table-container > el-card {
+  flex: 1; /* 浣夸袱涓崱鐗囧钩鍒嗗彲鐢ㄧ┖闂� */
+  margin-bottom: 10px; /* 鍙�夛紝鏍规嵁闇�瑕佹坊鍔犲簳閮ㄩ棿璺� */
+}
+#dotClass {
+  display: flex;
+  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楂樺害璋冩暣 */
+}
+.loading-container {
+  position: relative;
+  height: 100%;
+}
+/* 纭繚閬僵灞傚湪鏈�椤跺眰 */
+.el-loading-mask {
+  z-index: 2000 !important;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0