From db3d5331c74d29806622dd272630243a74745c82 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 05 三月 2025 17:04:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowslicecage.vue | 111 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 39 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 36d40ee..4c53783 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -409,7 +409,7 @@
const rectStyle = (rect, index) => ({
position: 'absolute',
width: '170px',
- left: '0px',
+ right: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -425,24 +425,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStyle = (rectIndex, subIndex) => {
const width = '18px';
- const marginLeft = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
- const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
+ 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%',
- marginLeft,
+ marginRight,
top: '0px',
backgroundColor: '#911005',
- left,
+ right,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStylea = (rect, index) => ({
position: 'absolute',
width: '170px',
- left: '0px',
+ right: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -458,24 +458,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStylea = (rectIndex, subIndex) => {
const width = '18px';
- const marginLeft = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
- const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
+ 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%',
- marginLeft,
+ marginRight,
top: '0px',
backgroundColor: '#911005',
- left,
+ right,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStyleb = (rect, index) => ({
position: 'absolute',
width: '170px',
- left: '0px',
+ right: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -491,24 +491,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStyleb = (rectIndex, subIndex) => {
const width = '18px';
- const marginLeft = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
- const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
+ 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%',
- marginLeft,
+ marginRight,
top: '0px',
backgroundColor: '#911005',
- left,
+ right,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStylec = (rect, index) => ({
position: 'absolute',
width: '170px',
- left: '0px',
+ right: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -524,24 +524,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStylec = (rectIndex, subIndex) => {
const width = '18px';
- const marginLeft = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
- const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
+ 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%',
- marginLeft,
+ marginRight,
top: '0px',
backgroundColor: '#911005',
- left,
+ right,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStyled = (rect, index) => ({
position: 'absolute',
width: '170px',
- left: '0px',
+ right: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -557,9 +557,9 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStyled = (rectIndex, subIndex) => {
const width = '18px';
- const marginLeft = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
- const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
+ const marginRight = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
+ const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
@@ -567,7 +567,7 @@
marginLeft,
top: '0px',
backgroundColor: '#911005',
- left,
+ right,
};
};
onMounted(() => {
@@ -593,6 +593,28 @@
case 102:
return t('searchOrder.rengongxp');
}
+}
+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 '';
}
onBeforeUnmount(() => {
closeWebSocket();
@@ -637,6 +659,7 @@
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
<el-table height="300px" ref="table"
@selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName"
:data="tableDatad" :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" />
@@ -645,6 +668,13 @@
<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>
</el-card>
@@ -663,7 +693,7 @@
</div>
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
- <div class="img-car1" :style="'z-index:999;left:475px;top:' + 1700*carPosition[0] + 'px;position:absolute;'">
+ <div class="img-car1" :style="'z-index:999;left:305px;top:' + 1700*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -677,7 +707,7 @@
>
</div>
</div>
- <div class="img-car4" :style="'z-index:999;left:890px;top:' + 600*carPosition[1] + 'px;position:absolute;'">
+ <div class="img-car4" :style="'z-index:999;left:730px;top:' + 600*carPosition[1] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjust"
:key="rect.id"
@@ -692,7 +722,7 @@
</div>
</div>
<div style="position: relative;">
- <div v-show="cell1" style="width: 170px;height: 46px;position: relative;top:387px;left: 690px;">
+ <div v-show="cell1" style="width: 170px;height: 46px;position: relative;top:387px;left: 523px;">
<div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRects(rectIndex)"
@@ -701,7 +731,7 @@
></div>
</div>
</div>
- <div v-show="cell2" style="width: 170px;height: 46px;position: relative;top:389px;left: 690px;">
+ <div v-show="cell2" style="width: 170px;height: 46px;position: relative;top:389px;left: 523px;">
<div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
@@ -710,7 +740,7 @@
></div>
</div>
</div>
- <div v-show="cell3" style="width: 170px;height: 46px;position: relative;top:391px;left: 690px;">
+ <div v-show="cell3" style="width: 170px;height: 46px;position: relative;top:391px;left: 523px;">
<div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
@@ -719,7 +749,7 @@
></div>
</div>
</div>
- <div v-show="cell4" style="width: 170px;height: 46px;position: relative;top:392px;left: 690px;">
+ <div v-show="cell4" style="width: 170px;height: 46px;position: relative;top:392px;left: 523px;">
<div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
@@ -728,7 +758,7 @@
></div>
</div>
</div>
- <div v-show="cell5" style="width: 170px;height: 46px;position: relative;top:394px;left: 690px;">
+ <div v-show="cell5" style="width: 170px;height: 46px;position: relative;top:394px;left: 523px;">
<div v-for="(rect, rectIndex) in adjustedRectsd" :key="rect.id" :style="rectStyled(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsd(rectIndex)"
@@ -903,7 +933,7 @@
</div>
</el-dialog>
</template>
-<style scoped>
+<style>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
@@ -1001,9 +1031,9 @@
background-repeat: no-repeat;
background-attachment: local;
min-height: 700px;
- width: 1200px;
+ width: 1000px;
max-width: 100%;
- background-size: 1200px 700px;
+ background-size: 1000px 700px;
overflow: hidden;
position:relative
}
@@ -1049,4 +1079,7 @@
margin-top: 20px;
margin-bottom: 10px;
}
+.row-red-background {
+ background-color: #CDAF95 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0