From e86a8267dd7acd49cde660c9f4151a687c4c42e6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 四月 2024 11:54:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 UI-Project/src/views/Slicecage/slicecage.vue |  285 +++++++++++++++------------------------------------------
 1 files changed, 75 insertions(+), 210 deletions(-)

diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index ea231b5..9c7b9f9 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -12,203 +12,30 @@
 
 const currentPage4 = ref(4)
 const pageSize4 = ref(100)
-// const tableData = [
-//   {
-//     id: '1',
-//     long: '1005',
-//     wide: '183.6',
-//     thick: '1991',
-//     type: '1234567',
-//     typea: '1',
-//   },
-// ]
-// const tableDatab = [
-//   {
-//     idb: '2',
-//     longb: '105',
-//     wideb: '183',
-//     typeb: '123456',
-//   }
-// ]
-const tableDataa = [
+const tableData = [
   {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
-  },
-  {
-    ida: '3',
-    typea: '1991',
+    id: '1',
+    a: '1',
+    b: '1',
+    c: '123456789',
+    d: '1568251',
+    e: '1',
+    f: '100',
+    g: '',
   },
 ]
-
+const tableDatab = [
+  {
+    id: '2',
+    a: '2',
+    b: '2',
+    c: '123456789',
+    d: '1568251',
+    e: '1',
+    f: '100',
+    g: '',
+  }
+]
 const dialogForm = () => {
   ElMessageBox.confirm(
     '纭畾瑕佹�ュ仠鍚�?',
@@ -300,13 +127,13 @@
         @selection-change="handleSelectionChange"
         :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
           <el-table-column prop="id" align="center" label="鍑虹墖鐜荤拑ID" min-width="80" />
-          <el-table-column prop="long" align="center" label="绗煎瓙" min-width="120" />
-          <el-table-column prop="wide" align="center" label="鏍煎瓙" min-width="120" />
-          <el-table-column prop="type" align="center" label="宸ョ▼鍙�" min-width="120" />
-          <el-table-column prop="type" align="center" label="娴佺▼鍗″彿" min-width="120" />
-          <el-table-column prop="type" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="120" />
-          <el-table-column prop="type" align="center" label="灏哄" min-width="120" />
-          <el-table-column prop="type" align="center" label="缁撴潫浠诲姟" min-width="120" />
+          <el-table-column prop="a" align="center" label="绗煎瓙" min-width="120" />
+          <el-table-column prop="b" align="center" label="鏍煎瓙" min-width="120" />
+          <el-table-column prop="c" align="center" label="宸ョ▼鍙�" min-width="120" />
+          <el-table-column prop="d" align="center" label="娴佺▼鍗″彿" min-width="120" />
+          <el-table-column prop="e" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="157" />
+          <el-table-column prop="f" align="center" label="灏哄" min-width="120" />
+          <el-table-column prop="g" align="center" label="缁撴潫浠诲姟" min-width="120" />
         </el-table>
       </div>
     </el-card>
@@ -315,14 +142,14 @@
         <el-table height="100%" ref="table" 
         @selection-change="handleSelectionChange"
         :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
-          <el-table-column prop="idb" align="center" label="杩涚墖鐜荤拑ID" min-width="80" />
-          <el-table-column prop="longb" align="center" label="绗煎瓙" min-width="120" />
-          <el-table-column prop="wideb" align="center" label="鏍煎瓙" min-width="120" />
-          <el-table-column prop="typeb" align="center" label="宸ョ▼鍙�" min-width="120" />
-          <el-table-column prop="typeb" align="center" label="娴佺▼鍗″彿" min-width="120" />
-          <el-table-column prop="typeb" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="120" />
-          <el-table-column prop="typeb" align="center" label="灏哄" min-width="120" />
-          <el-table-column prop="typeb" align="center" label="缁撴潫浠诲姟" min-width="120" />
+          <el-table-column prop="id" align="center" label="杩涚墖鐜荤拑ID" min-width="80" />
+          <el-table-column prop="a" align="center" label="绗煎瓙" min-width="120" />
+          <el-table-column prop="b" align="center" label="鏍煎瓙" min-width="120" />
+          <el-table-column prop="c" align="center" label="宸ョ▼鍙�" min-width="120" />
+          <el-table-column prop="d" align="center" label="娴佺▼鍗″彿" min-width="120" />
+          <el-table-column prop="e" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="157" />
+          <el-table-column prop="f" align="center" label="灏哄" min-width="120" />
+          <el-table-column prop="g" align="center" label="缁撴潫浠诲姟" min-width="120" />
         </el-table>
       </div>
     </el-card>
@@ -338,8 +165,13 @@
                     </el-col>
                 </div>
     </div>
+    <!-- <div id="awatch">
+  <img src="../../assets/lpl.jpg" alt="" style="width: 10%;height: 10%;margin-left: 160px;">
+</div> -->
+
+
     <div id="awatch">
-  <img src="../../assets/xmjc.png" alt="" style="width: 70%;height: 100%;margin-left: 160px;">
+  <img src="../../assets/cp.png" alt="" style="width: 1305px;height: 400px;margin-left: 240px;margin-top: 50px;">
 </div>
   </div>
 <el-dialog v-model="dialogFormVisible" top="12vh" width="85%" title="璇风‘璁ょ幓鐠冧俊鎭�" >
@@ -565,4 +397,37 @@
    ::-webkit-scrollbar {
      width: 0 !important;height: 0;
    }
+   .img-list{
+	
+  position:relative;
+}
+.data-img{
+  @apply float-none ;
+  
+  width:100%;
+  height:16rem;
+  background: rgba(0, 0, 0, 0);
+  opacity: 1;
+  border-radius: 0.5rem 0.5rem 0px 0px;
+
+}
+.check-img{
+  position: absolute;
+  width: 3.3125rem;
+  height: 2.9375rem;
+  top:20rem;
+  right: 52rem;
+  z-index: 10;
+  
+}
+.check-imga{
+  position: absolute;
+  width: 3.3125rem;
+  height: 2.9375rem;
+  top:15rem;
+  right: 37rem;
+  z-index: 10;
+  
+}
+
 </style>
\ No newline at end of file

--
Gitblit v1.8.0