From f14fdc97e8d1e6729ee9be864ded0d7157a77223 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 七月 2024 10:34:24 +0800
Subject: [PATCH] 下片界面接口传参修改
---
UI-Project/src/views/Slicecage/slicecage.vue | 175 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 111 insertions(+), 64 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 3035fa4..5fd9087 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -20,8 +20,11 @@
const tableDatad = ref([])
const tableDataf = ref([])
const tableDatae = ref([])
+const carPosition = ref([])
const adjustedRects = ref([]);
const project = ref([]);
+const adjust = ref([]);
+const adjusta = ref([]);
const adjustedRectsa = ref([]);
const adjustedRectsb = ref([]);
const adjustedRectsc = ref([]);
@@ -29,6 +32,7 @@
const adjustedRectse = ref([]);
const adjustedRectsf = ref([]);
const adjustedRectsg = ref([]);
+const adjustedRectsh = ref([]);
const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
const add = ref(false)
const flowCardId = ref('');
@@ -42,17 +46,11 @@
const temperingLayoutId = 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);
@@ -69,6 +67,7 @@
const cell6=ref(true);
const cell7=ref(true);
const cell8=ref(true);
+const cell9=ref(true);
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
@@ -129,7 +128,11 @@
}
return index;
}
-
+ function jumpToPage(page: number) {
+ if (page >= 1 && page <= totalPages.value) {
+ currentPage.value = page;
+ }
+}
// 涓婁竴椤靛拰涓嬩竴椤垫柟娉�
const prevPage = () => {
if (currentPage.value > 1) {
@@ -468,50 +471,61 @@
// 鏇存柊 tableData 鐨勬暟鎹�
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
+ // adjust.value = data.bigStorageCageDetailsFeedTask[0].map(rect => ({
+ // ...rect,
+ // }));
+ adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+ adjust.value = data.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+// const adjust = computed(() => {
+// return data.value.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+// });
tableData.value = data.bigStorageCageInfo[0]
tableDatab.value = data.temperingGlassInfoList[0]
tableDatae.value = data.bigStorageCageUsage[0]
- // adjustedRects.value = data.bigStorageCageInfo1[0]
- window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
+ carPosition.value = data.carPostion[0]
+ window.localStorage.setItem('length', data.bigStorageCageInfos[0][1].length)
let length = window.localStorage.getItem('length')
- adjustedRects.value = data.bigStorageCageInfo1[0].map(rect => ({
+ adjustedRects.value = data.bigStorageCageInfos[0][1].map(rect => ({
...rect,
height: 20/length,
top: 29/length
}));
- let small = data.bigStorageCageInfo1[0]
- console.log(small[0].bigStorageCageDetails);
-adjustedRectsa.value = data.bigStorageCageInfo2[0].map(rect => ({
+adjustedRectsa.value = data.bigStorageCageInfos[0][2].map(rect => ({
...rect,
height: 20/length,
top: 29/length
}));
-adjustedRectsb.value = data.bigStorageCageInfo3[0].map(rect => ({
+adjustedRectsb.value = data.bigStorageCageInfos[0][3].map(rect => ({
...rect,
height: 20/length,
top: 29/length
}));
-adjustedRectsc.value = data.bigStorageCageInfo4[0].map(rect => ({
+adjustedRectsc.value = data.bigStorageCageInfos[0][4].map(rect => ({
...rect,
height: 20/length,
top: 29/length
}));
-adjustedRectsd.value = data.bigStorageCageInfo5[0].map(rect => ({
+adjustedRectsd.value = data.bigStorageCageInfos[0][5].map(rect => ({
...rect,
height: 20/length,
top: 29/length
}));
-adjustedRectse.value = data.bigStorageCageInfo6[0].map(rect => ({
+adjustedRectse.value = data.bigStorageCageInfos[0][6].map(rect => ({
...rect,
height: 20/length,
top: 29/length
}));
-adjustedRectsf.value = data.bigStorageCageInfo7[0].map(rect => ({
+adjustedRectsf.value = data.bigStorageCageInfos[0][7].map(rect => ({
...rect,
height: 20/length,
top: 29/length
}));
-adjustedRectsg.value = data.bigStorageCageInfo8[0].map(rect => ({
+adjustedRectsg.value = data.bigStorageCageInfos[0][8].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsh.value = data.bigStorageCageInfos[0][9].map(rect => ({
...rect,
height: 20/length,
top: 29/length
@@ -587,7 +601,7 @@
<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.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="120" />
<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" />
@@ -600,9 +614,9 @@
<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="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120"/>
<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="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140"/>
<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"/>
@@ -623,7 +637,7 @@
<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.glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="120" />
<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">
@@ -635,9 +649,9 @@
<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="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120"/>
<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="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140"/>
<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"/>
@@ -667,24 +681,39 @@
</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 class="img-car1" :style="'z-index:999;left:247px;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: index * 5+ `px`,
+ top: '10px',
+ }"
+ >
</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 class="img-car4" :style="'z-index:999;left:704px;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: index * 5+ `px`,
+ top: '10px',
+ }"
+ >
</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 style="position: relative;">
<div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:55px;left: 465px;">
<div
v-for="(rect, index) in adjustedRects"
- :key="rect.id"
+ :key="rect"
:style="{
// display:'flex',
@@ -928,6 +957,37 @@
</div>
</div>
</div>
+ <div v-show="cell9" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsh"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -996,7 +1056,7 @@
</el-table>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="5vh" width="97%" :title="$t('searchOrder.cageinformation')">
+<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
<el-table
:data="paginatedUsers"
@row-click="handleRowClick"
@@ -1017,9 +1077,9 @@
: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="90"/>
- <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="110" />
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="120" />
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130"/>
+ <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="130" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
<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" />
@@ -1086,7 +1146,16 @@
<div style="margin-top: 20px; text-align: center;">
<!-- 涓婁竴椤垫寜閽� -->
<el-button @click="prevPage" :disabled="currentPage === 1">{{ $t('searchOrder.up') }}</el-button>
-
+ <div style="display: inline-block; margin: 0 20px;">
+ <el-button
+ v-for="page in totalPages"
+ :key="page"
+ :class="{ 'is-active': currentPage === page }"
+ @click="jumpToPage(page)"
+ >
+ {{ page }}
+ </el-button>
+ </div>
<!-- 涓嬩竴椤垫寜閽� -->
<el-button @click="nextPage" :disabled="currentPage >= totalPages">{{ $t('searchOrder.down') }}</el-button>
@@ -1263,30 +1332,7 @@
position:relative
}
.img-car1{
- 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
-}
-.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{
+ display: flex;
background-image:url('../../assets/lp.png');
position: absolute;
background-repeat: no-repeat;
@@ -1299,6 +1345,7 @@
position:relative
}
.img-car4{
+ display: flex;
background-image:url('../../assets/lpa.png');
position: absolute;
background-repeat: no-repeat;
--
Gitblit v1.8.0