From 5a723d52fae6f080dd16eead0bab8767e606cff3 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 19 九月 2024 08:50:04 +0800
Subject: [PATCH] 页面样式修正和语言

---
 UI-Project/src/views/MechanicalArm/mechanicalArm.vue |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/views/MechanicalArm/mechanicalArm.vue b/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
index a519970..718d589 100644
--- a/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
+++ b/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
@@ -219,7 +219,7 @@
 <template>
   <div ref="content" style="padding:0 20px;">
     <div id="div-title" style="font-size: 20px; font-weight: bold; margin:10px 0 10px 0;padding-left: 20px;">
-      {{$t('machine.mechanicalArm')}}
+      {{$t('machine.upperSlice')}}
     </div>
     <hr />
     <br>
@@ -257,9 +257,29 @@
     </div>
 
     <div id="main-body" 
-      style="width: 45%; height: 400px;;background-image: url(../../src/assets/涓婄墖鏈�.png) ;background-size: 100% 100%;">
+      style="width: 45%; height: 400px;margin: 50px 0 0 50px;background-image: url(../../src/assets/涓婄墖鏈�.png) ;background-size: 100% 100%;">
       <!-- 鐢诲浘鍐呭 -->
       <div style="width: 200px; height: 100px; background-color: red; position: relative; top: 271px; left: 158px">
+        <div style="width: 500px; height: 300px; position: relative; top: -250PX; left: 800px">
+          <el-table :data="loadData" stripe
+        :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }"
+        :cell-style="{ textAlign: 'center' }">
+        <!-- <el-table-column type="selection" min-width="30" /> -->
+        <el-table-column type="index" :label="$t('glassInfo.number')" min-width="55" />
+        <el-table-column prop="batchNumber" :label="$t('glassInfo.batchNumber')"/>
+        <el-table-column prop="taskType" :label="$t('glassInfo.taskType')"/>
+        <el-table-column prop="glassId" :label="$t('glassInfo.glassId')" />
+        <el-table-column prop="length" :label="$t('glassInfo.length')" min-width="55"/>  
+        <el-table-column prop="width" :label="$t('glassInfo.width')" min-width="55"/>
+        <el-table-column prop="thickness" :label="$t('glassInfo.thickness')"/>
+        <el-table-column prop="workState" :label="$t('glassInfo.workState')"/>
+        <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="100">
+          <template #default="scope">
+            <el-button size="mini" style="min-width: 100px;" link type="primary" plain @click="workStatus(scope.row, '缁戝畾')" >{{$t('functionState.bound')}}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+        </div>
       </div>
     </div>
   </div>

--
Gitblit v1.8.0