From aafee825656183f3d5c56ddefa64a8b1e757c959 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 05 十一月 2025 08:52:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/assets/ganghuaqian1.png | 0
UI-Project/src/assets/zhongkong1.png | 0
UI-Project/src/assets/zhongkong.png | 0
UI-Project/src/views/Slicecage/slicecage.vue | 114 +++++++++++++++++++++++++++-
UI-Project/src/views/hollow/hollowslicecage.vue | 72 ++++++++++++++---
UI-Project/src/assets/ganghuaqian.png | 0
UI-Project/src/assets/微信图片_20251104132805_3454_72.jpg | 0
7 files changed, 167 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/assets/ganghuaqian.png b/UI-Project/src/assets/ganghuaqian.png
index 818b191..54d6ccc 100644
--- a/UI-Project/src/assets/ganghuaqian.png
+++ b/UI-Project/src/assets/ganghuaqian.png
Binary files differ
diff --git a/UI-Project/src/assets/ganghuaqian1.png b/UI-Project/src/assets/ganghuaqian1.png
new file mode 100644
index 0000000..818b191
--- /dev/null
+++ b/UI-Project/src/assets/ganghuaqian1.png
Binary files differ
diff --git a/UI-Project/src/assets/zhongkong.png b/UI-Project/src/assets/zhongkong.png
index 359c5a0..d5a8ef6 100644
--- a/UI-Project/src/assets/zhongkong.png
+++ b/UI-Project/src/assets/zhongkong.png
Binary files differ
diff --git a/UI-Project/src/assets/zhongkong1.png b/UI-Project/src/assets/zhongkong1.png
new file mode 100644
index 0000000..359c5a0
--- /dev/null
+++ b/UI-Project/src/assets/zhongkong1.png
Binary files differ
diff --git "a/UI-Project/src/assets/\345\276\256\344\277\241\345\233\276\347\211\207_20251104132805_3454_72.jpg" "b/UI-Project/src/assets/\345\276\256\344\277\241\345\233\276\347\211\207_20251104132805_3454_72.jpg"
new file mode 100644
index 0000000..a56be0c
--- /dev/null
+++ "b/UI-Project/src/assets/\345\276\256\344\277\241\345\233\276\347\211\207_20251104132805_3454_72.jpg"
Binary files differ
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 84d93f7..9c777e1 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -51,10 +51,14 @@
const adjustedRectsa = ref([]);
const adjustedRectsb = ref([]);
const adjustedRectsc = ref([]);
+const adjustedRectsd = ref([]);
+const adjustedRectse = ref([]);
const subRectsCounts = ref([]);
const subRectsCountsa = ref([]);
const subRectsCountsb = ref([]);
const subRectsCountsc = ref([]);
+const subRectsCountsd = ref([]);
+const subRectsCountse = ref([]);
const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
const showAlert = ref(false)
const alertMessage = ref('')
@@ -81,6 +85,8 @@
const cell2=ref(true);
const cell3=ref(true);
const cell4=ref(true);
+const cell5=ref(true);
+const cell6=ref(true);
const canEdit = ref(true);
const selectedRow = ref(null);
const temperingtotal = ref(0);
@@ -916,11 +922,25 @@
top: 53/55,
}));
subRectsCountsc.value = data.bigStorageCageInfos[0][4].map(rect => rect.count);
+adjustedRectsd.value = data.bigStorageCageInfos[0][5].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCountsd.value = data.bigStorageCageInfos[0][5].map(rect => rect.count);
+adjustedRectse.value = data.bigStorageCageInfos[0][6].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCountse.value = data.bigStorageCageInfos[0][6].map(rect => rect.count);
}else{
adjustedRects.value = '',
adjustedRectsa.value = '',
adjustedRectsb.value = '',
- adjustedRectsc.value = ''
+ adjustedRectsc.value = '',
+ adjustedRectsd.value = '',
+ adjustedRectse.value = ''
}
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
@@ -1039,8 +1059,74 @@
}
return subRects;
};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStyled = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsd = (rectIndex) => {
+ const count = subRectsCountsd.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStylee = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectse = (rectIndex) => {
+ const count = subRectsCountse.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStylec = (rectIndex, subIndex) => {
+ const width = '18px';
+ 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%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStyled = (rectIndex, subIndex) => {
+ const width = '18px';
+ 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%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStylee = (rectIndex, subIndex) => {
const width = '18px';
const marginRight = '8px';
const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
@@ -1258,7 +1344,7 @@
></div>
</div>
</div>
- <div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:72px;left: 445px;">
+ <div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:70px;left: 445px;">
<div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
@@ -1267,7 +1353,7 @@
></div>
</div>
</div>
- <div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:81px;left: 445px;">
+ <div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:76px;left: 445px;">
<div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
@@ -1276,12 +1362,30 @@
></div>
</div>
</div>
- <div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:89px;left: 445px;">
+ <div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:84px;left: 445px;">
<div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
:key="subIndex"
:style="subRectStylec(rectIndex, subIndex)"
+ ></div>
+ </div>
+ </div>
+ <div v-show="cell5" style="width: 170px;height: 53px;position: relative;top:-16px;left: 45px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsd" :key="rect.id" :style="rectStyled(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsd(rectIndex)"
+ :key="subIndex"
+ :style="subRectStyled(rectIndex, subIndex)"
+ ></div>
+ </div>
+ </div>
+ <div v-show="cell6" style="width: 170px;height: 53px;position: relative;top:-6px;left: 45px;">
+ <div v-for="(rect, rectIndex) in adjustedRectse" :key="rect.id" :style="rectStylee(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectse(rectIndex)"
+ :key="subIndex"
+ :style="subRectStylee(rectIndex, subIndex)"
></div>
</div>
</div>
@@ -1809,7 +1913,7 @@
.img-dlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('/ganghuaqian.png');
+ background-image:url('/src/assets/ganghuaqian.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 380px;
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 7578b56..d1c3711 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -54,11 +54,13 @@
const adjustedRectsb = ref([]);
const adjustedRectsc = ref([]);
const adjustedRectsd = ref([]);
+const adjustedRectse = ref([]);
const subRectsCounts = ref([]);
const subRectsCountsa = ref([]);
const subRectsCountsb = ref([]);
const subRectsCountsc = ref([]);
const subRectsCountsd = ref([]);
+const subRectsCountse = ref([]);
const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
const currentLack = reactive({});
const currentPage2 = ref(1)
@@ -634,39 +636,47 @@
adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCounts.value = data.bigStorageCageInfos[0][1].map(rect => rect.count);
adjustedRectsa.value = data.bigStorageCageInfos[0][2].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCountsa.value = data.bigStorageCageInfos[0][2].map(rect => rect.count);
adjustedRectsb.value = data.bigStorageCageInfos[0][3].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCountsb.value = data.bigStorageCageInfos[0][3].map(rect => rect.count);
adjustedRectsc.value = data.bigStorageCageInfos[0][4].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCountsc.value = data.bigStorageCageInfos[0][4].map(rect => rect.count);
adjustedRectsd.value = data.bigStorageCageInfos[0][5].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCountsd.value = data.bigStorageCageInfos[0][5].map(rect => rect.count);
+adjustedRectse.value = data.bigStorageCageInfos[0][6].map((rect, index) => ({
+ id: index + 1,
+ height: 15/55,
+ top: 64/55,
+ }));
+subRectsCountse.value = data.bigStorageCageInfos[0][6].map(rect => rect.count);
+
}else{
adjustedRects.value = '',
adjustedRectsa.value = '',
adjustedRectsb.value = '',
- adjustedRectsc.value = ''
- adjustedRectsd.value = ''
+ adjustedRectsc.value = '',
+ adjustedRectsd.value = '',
+ adjustedRectse.value = ''
}
};
const getAlertText = (alarmCode) => {
@@ -850,6 +860,31 @@
left,
};
};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectse = (rectIndex) => {
+ const count = subRectsCountse.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStylee = (rectIndex, subIndex) => {
+ const width = '18px';
+ const marginLeft = '3px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginLeft,
+ top: '0px',
+ backgroundColor: '#911005',
+ left,
+ };
+};
const iframeUrl = ref('');
const handlehistorical = (row) => {
blindb.value = true;
@@ -996,7 +1031,7 @@
>
</div>
</div>
- <div class="img-car4" :style="'z-index:999;left:588px;top:' + 450*carPosition[1] + 'px;position:absolute;'">
+ <div class="img-car4" :style="'z-index:999;left:580px;top:' + 450*carPosition[1] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjust"
:key="rect.id"
@@ -1011,7 +1046,7 @@
</div>
</div>
<div style="position: relative;">
- <div v-show="cell1" style="width: 150px;height: 33px;position: relative;top:292px;left: 418px;">
+ <div v-show="cell1" style="width: 150px;height: 64px;position: relative;top:82px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRects(rectIndex)"
@@ -1020,7 +1055,7 @@
></div>
</div>
</div>
- <div v-show="cell2" style="width: 150px;height: 33px;position: relative;top:295px;left: 418px;">
+ <div v-show="cell2" style="width: 150px;height: 64px;position: relative;top:88px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
@@ -1029,7 +1064,7 @@
></div>
</div>
</div>
- <div v-show="cell3" style="width: 150px;height: 33px;position: relative;top:298px;left: 418px;">
+ <div v-show="cell3" style="width: 150px;height: 64px;position: relative;top:93px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
@@ -1038,7 +1073,7 @@
></div>
</div>
</div>
- <div v-show="cell4" style="width: 150px;height: 33px;position: relative;top:301px;left: 418px;">
+ <div v-show="cell4" style="width: 150px;height: 64px;position: relative;top:99px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
@@ -1047,12 +1082,21 @@
></div>
</div>
</div>
- <div v-show="cell5" style="width: 150px;height: 33px;position: relative;top:304px;left: 418px;">
+ <div v-show="cell5" style="width: 150px;height: 64px;position: relative;top:105px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRectsd" :key="rect.id" :style="rectStyled(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsd(rectIndex)"
:key="subIndex"
:style="subRectStyled(rectIndex, subIndex)"
+ ></div>
+ </div>
+ </div>
+ <div v-show="cell6" style="width: 150px;height: 64px;position: relative;top:28px;left: 40px;">
+ <div v-for="(rect, rectIndex) in adjustedRectse" :key="rect.id" :style="rectStyled(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectse(rectIndex)"
+ :key="subIndex"
+ :style="subRectStylee(rectIndex, subIndex)"
></div>
</div>
</div>
@@ -1377,7 +1421,7 @@
.img-zkdlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('/zhongkong.png');
+ background-image:url('/src/assets/zhongkong.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 500px;
--
Gitblit v1.8.0