From df13b23a2fa3519e6f796ed946d87412a6a5f7ca Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 07 三月 2025 16:56:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowslicecage.vue | 77 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 4c53783..d4d6db5 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -27,6 +27,7 @@
const tableDataf = ref([])
const tableDatae = ref([])
const carPosition = ref([])
+const tableDatass = ref([])
const ganghua = ref('')
const diaodu = ref('')
const flowCardId = ref('')
@@ -298,6 +299,11 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
+ if(data.bigStorageSummary!=null){
+ tableDatass.value = data.bigStorageSummary[0]
+ }else{
+ tableDatass.value = ''
+ }
if (data.inkageEntity != null) {
inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
}
@@ -409,7 +415,7 @@
const rectStyle = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -425,24 +431,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStyle = (rectIndex, subIndex) => {
const width = '18px';
- const marginRight = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
- const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
height: '100%',
- marginRight,
+ marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStylea = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -458,24 +464,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStylea = (rectIndex, subIndex) => {
const width = '18px';
- const marginRight = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
- const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
height: '100%',
- marginRight,
+ marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStyleb = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -491,24 +497,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStyleb = (rectIndex, subIndex) => {
const width = '18px';
- const marginRight = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
- const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
height: '100%',
- marginRight,
+ marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStylec = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -524,24 +530,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
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}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
height: '100%',
- marginRight,
+ marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStyled = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -557,9 +563,9 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
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}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
@@ -567,7 +573,7 @@
marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
onMounted(() => {
@@ -769,6 +775,19 @@
</div>
</div>
</div>
+<el-card style="flex: 1;margin-left: 1020px;margin-top: -670px;" v-loading="loading">
+ <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 550px;">
+ <el-table height="550px" ref="table" border
+ :data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
+ <el-table-column prop="sumCount" align="center" :label="$t('searchOrder.totallogarithms')" min-width="120" />
+ <el-table-column prop="pairCount" align="center" :label="$t('searchOrder.numberpairs')" min-width="120" />
+ <el-table-column prop="sumCountlayer" align="center" :label="$t('hellow.totalnumber')" min-width="120" />
+ <el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="120" />
+ <el-table-column prop="slotCount" align="center" :label="$t('searchOrder.numberoccupied')" min-width="120" />
+ </el-table>
+ </div>
+ </el-card>
</div>
<!-- 娣诲姞鐞嗙墖绗间俊鎭� -->
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
--
Gitblit v1.8.0