From 8a76767b0a7ad271c8487a02063590b956deb5df Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 25 七月 2024 14:30:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 UI-Project/src/views/UnLoadGlass/loadmachinerack.vue |  108 +++++++++++++++++++++++-------------------------------
 1 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 9769112..581478d 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -1,10 +1,8 @@
 <script setup>
 import {Search} from "@element-plus/icons-vue";
 import {reactive, onMounted, onBeforeUnmount} from "vue";
-
 import {useRouter} from "vue-router"
 const router = useRouter()
-
 import { useI18n } from 'vue-i18n'
   const { t } = useI18n()
   let language = ref(localStorage.getItem('lang') || 'zh')
@@ -39,7 +37,6 @@
     fetchFlowCardId(); 
   dialogFormVisiblea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
 };
-
 //鑾峰彇娴佺▼鍗″彿
 const fetchFlowCardId = async () => {
   try {
@@ -59,7 +56,6 @@
   }
 };
 //纭
-
 const handleConfirm = async () => {
   try {
     const firstPart = flowCardId.value.split('|')[0].trim(); // 
@@ -68,9 +64,7 @@
       workstationId: workstationId.value,
       flowCardId: firstPart,
       layer:twoPart
-
     }); 
-
     console.log(response)
     if (response.code == 200) {
       // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
@@ -88,16 +82,12 @@
     console.error(error);
   }
 };
-
-
 const updatePageData = () => {
   // 鍋囪浣犵殑椤甸潰涓婃湁涓�涓悕涓� tableData 鐨� Vue 缁勪欢
   // 浣犲彲浠ョ洿鎺ユ洿鏂� tableData 鐨勬暟鎹�
   fetchTableData()
   // 浣跨敤 $forceUpdate() 寮哄埗鏇存柊缁勪欢
-
 };
-
 const handleBindRack2 = (row) => {
   workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
   dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
@@ -116,7 +106,7 @@
             console.log('娓呴櫎鎴愬姛');
             ElMessage.success(response.message);
             dialogFormVisiblea2.value = false;
-        } else if (response.code === 400) {
+        } else if (response.code === 500) {
             // 娓呴櫎澶辫触鐨勯�昏緫
             console.log('娓呴櫎澶辫触');
             console.log(response.message); // 鎵撳嵃鏈嶅姟鍣ㄨ繑鍥炵殑閿欒淇℃伅
@@ -129,8 +119,6 @@
             dialogFormVisiblea2.value = false;
     }
 };
-
-
 // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
 const fetchTableData = async () => {
   try {
@@ -151,52 +139,47 @@
     ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
   }
 };
-
-
 const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`;
 // 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
 const handleMessage = (data) => {
-
   // 鏇存柊 tableData 鐨勬暟鎹�
-
   tableData.splice(0, tableData.length, ...data.params[0]);
 //  console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
-
 };
-
 // 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
-
 onMounted(() => {
   fetchFlowCardId();
   fetchTableData(); // 鑾峰彇鏁版嵁
   initializeWebSocket(socketUrl, handleMessage);
 });
-
 onBeforeUnmount(() => {
   console.log("鍏抽棴浜�")
   closeWebSocket();
 });
 
+
 const getTagType =(status) => {
       return status === 1 ? 'success' : 'danger';
       // 鏍规嵁鐘舵�佸�煎喅瀹氭爣绛剧被鍨嬶紝杩欓噷鍋囪鐘舵�佷负1鏃朵负鎴愬姛锛堢豢鑹诧級锛屽惁鍒欎负澶辫触锛堢孩鑹诧級
     }
-
+ 
     const toggleStatus = (row) => {
       // 鍒囨崲鏂欐灦鐘舵�佺殑閫昏緫
       row.enableState = 1 - row.enableState; // Toggle between 0 and 1
       // 姝ゅ鍙互娣诲姞淇濆瓨鐘舵�佺殑閫昏緫锛屾瘮濡傝皟鐢� API 鏇存柊鏁版嵁
       updateRowStatus(row);
     };
-
+ 
     const updateRowStatus = async (row) => {
   try {
     // 鍋囪浣犵殑鍚庣 API 鎺ユ敹 PUT 璇锋眰锛屽苟涓旈渶瑕佷紶閫� row.id 鍜� row.enableState 鍙傛暟
    
-
+ 
     const response = await request.post('unLoadGlass/downWorkStation/updateDownWorkstation', {
-      enableState: 1 - row.enableState
+      enableState: row.enableState,
+      id: row.id
 
+ 
     }); 
     console.log('Updated row status:', response.data);
     // 鍙互鏍规嵁鍚庣杩斿洖鐨勬暟鎹繘琛岃繘涓�姝ュ鐞嗭紝姣斿鏇存柊鏈湴鐘舵�佺瓑
@@ -205,25 +188,34 @@
     // 澶勭悊閿欒鎯呭喌锛屾瘮濡傛彁绀虹敤鎴锋洿鏂板け璐�
   }
 };
+ 
 
 
+
+
+
+
+// beforeUnmount(() => {
+//   closeWebSocket();
+// });
+// setInterval(fetchTableData, 2000)
 </script>
-
 <template>
   <div>
-    <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: 200px;">
-        <el-table height="100%" ref="table" 
+    <el-card style="flex: 1;" v-loading="loading">
+      <el-card style="flex: 1;margin-left: 4px;margin-top: 1px;" v-loading="loading">
+      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
+        <el-table height="200px" ref="table" 
         @selection-change="handleSelectionChange"
         :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
           <el-table-column prop="workstationId" align="center" :label="$t('reportWork.lowerbit')" min-width="80" />
           <el-table-column prop="workstationId" align="center" :label="$t('reportWork.shelfnumber')" min-width="120" />
-          <el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="120" />
-          <el-table-column prop="totalquantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
-          <el-table-column prop="racksnumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
+          <el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="150" />
+          <el-table-column prop="totalQuantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
+          <el-table-column prop="racksNumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
           <el-table-column prop="layer" align="center" label="灞傛暟" min-width="120" />
           <el-table-column prop="otherNumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
-          <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" />
+          <!-- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" /> -->
           <el-table-column prop="deviceId" align="center" :label="$t('reportWork.devicenumber')" min-width="120" />
           <el-table-column
             align="center"
@@ -247,7 +239,22 @@
         </el-table>
       </div>
     </el-card>
-
+    <!-- workstationId: '1',
+    workstationId: '1005',
+    flowCardId: '183.6',
+    totalquantity: '1991',
+    racksnumber:"1",
+    work_state: '寰呰瘑鍒�', -->
+  <div style="display: flex;" class="awatch">
+  <div id="main-body">
+      <Landingindication></Landingindication>
+    </div>
+  <div id="main-bodya">
+    <Landingindicationtwo></Landingindicationtwo>
+    </div>
+    </div>
+    </el-card>
+  </div>
 
     <el-dialog v-model="dialogFormVisiblea" top="21vh" width="40%" :title="$t('reportWork.bindingshelves')">
     <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
@@ -273,12 +280,7 @@
       </div>
     </template>
   </el-dialog>
-
-
-
-
   <el-dialog v-model="dialogFormVisiblea2" top="21vh" width="30%" :title="$t('reportWork.clearglass')">
-
     <template #footer>
       <div id="dialog-footer">
         <el-button type="primary" @click="handleclear">
@@ -288,26 +290,8 @@
       </div>
     </template>
   </el-dialog>
-
-
-    <!-- workstationId: '1',
-    workstationId: '1005',
-    flowCardId: '183.6',
-    totalquantity: '1991',
-    racksnumber:"1",
-    work_state: '寰呰瘑鍒�', -->
-  </div>
-  <div style="display: flex;">
-  <div id="main-body">
-      <Landingindication></Landingindication>
-    </div>
-  <div id="main-bodya">
-    <Landingindicationtwo></Landingindicationtwo>
-    </div></div>
 </template>
-
 <style scoped>
-
 #dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
 #dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
 #dialog-footer{
@@ -323,15 +307,15 @@
    background-color: #337ecc;
    margin-left: 28%;
 }
-#awatch{
-  height: 450px;
+.awatch{
+  max-width: 100%;
 }
 #main-body{
-  margin-top: -20px;
-  margin-left: 200px;
+  margin-top: -40px;
+  margin-left: 150px;
 }
 #main-bodya{
-  margin-top: -10px;
+  margin-top: -40px;
   margin-left: 100px;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0