From 94f66dff2fb642c7f503a3d8a845ff39a3a8d634 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 10 三月 2025 15:52:33 +0800
Subject: [PATCH] 中空模块增加玻璃数据显示、掰片/识别模块整体颜色根据钢化更改、上片模块架子复位按钮做限制判断
---
UI-Project/src/views/Slicecage/slicecage.vue | 591 +++++++++++++++++++++++++++--------------------------------
1 files changed, 270 insertions(+), 321 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 3dfe112..2927c05 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -3,10 +3,10 @@
import {useRouter} from "vue-router"
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
-import {computed, onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {ElMessage, ElMessageBox} from 'element-plus'
-import PrintLabel from "@/views/UnLoadGlass/PrintCustomLabelSemi1.vue";
+
const dialogFormVisibleaDownGlasss = ref(false)
const scanGlass = ref([])
const {t} = useI18n()
@@ -35,6 +35,7 @@
const tableDatae = ref([])
const tableDatax = ref([])
const tableDatas = ref([])
+const tableDatass = ref([])
const tableDatalack = ref([])
const tableDataspecify = ref([])
const tableDatacagedetails = ref([])
@@ -43,18 +44,17 @@
const diaodu = ref('')
const flowCardId = ref('')
const filmsId = ref('')
-const adjustedRects = ref([]);
const project = ref([]);
const adjust = ref([]);
const adjusta = ref([]);
+const adjustedRects = ref([]);
const adjustedRectsa = ref([]);
const adjustedRectsb = ref([]);
const adjustedRectsc = ref([]);
-const adjustedRectsd = ref([]);
-const adjustedRectse = ref([]);
-const adjustedRectsf = ref([]);
-const adjustedRectsg = ref([]);
-const adjustedRectsh = ref([]);
+const subRectsCounts = ref([]);
+const subRectsCountsa = ref([]);
+const subRectsCountsb = ref([]);
+const subRectsCountsc = ref([]);
const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
const currentPage2 = ref(1)
const inputValuesa = reactive({});
@@ -73,11 +73,6 @@
const cell2=ref(true);
const cell3=ref(true);
const cell4=ref(true);
-const cell5=ref(true);
-const cell6=ref(true);
-const cell7=ref(true);
-const cell8=ref(true);
-const cell9=ref(true);
const canEdit = ref(true);
const selectedRow = ref(null);
const temperingtotal = ref(0);
@@ -375,10 +370,8 @@
type: 'warning',
}
);
- if (confirmResult === 'confirm') {
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointEngineerId",{
- engineerId: row.engineer_id
- });
+ if (confirmResult === 'confirm') {
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId?engineerId=" + row.engineerId);
if (response.code === 200) {
ElMessage.success(response.message);
} else {
@@ -389,7 +382,7 @@
console.error('鍙戠敓閿欒:', error);
}
};
-// 鎸囧畾宸ョ▼
+// 鍙栨秷鎸囧畾
const broked = async() => {
try {
const confirmResult = await ElMessageBox.confirm(
@@ -538,7 +531,7 @@
deviceId: deviceId,
slot: slot
};
- const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
if (response.code === 200) {
tableDataa.value = response.data;
add.value = false;
@@ -575,12 +568,6 @@
const { engineerId, temperingLayoutId } = row;
fetchlack(engineerId, temperingLayoutId);
dialogFormVisibled.value = true;
-};
-// 鎸囧畾宸ョ▼
-const handlespecifyengineerid = (row) => {
- const { engineerId } = row;
- fetchspecify(engineerId);
- dialogFormVisiblee.value = true;
};
// 绗煎唴璇︽儏
const handlecagedetails = (row) => {
@@ -630,8 +617,8 @@
if (response.code === 200) {
ElMessage.success(response.message);
tableDataa.value = response.data
- filmsId.value = ''
- flowCardId.value = ''
+ // filmsId.value = ''
+ // flowCardId.value = ''
} else {
ElMessage.warning(response.msg)
}
@@ -662,24 +649,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatalack.value = response.data
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-}
-// 鎸囧畾宸ョ▼
-const fetchspecify = async (engineerId) => {
- try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId',{
- engineerId: engineerId,
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDataspecify.value = response.data
} else {
ElMessage.error(response.message);
}
@@ -811,20 +780,25 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
+ if(data.bigStorageSummary!=null){
+ tableDatass.value = data.bigStorageSummary[0]
+ }else{
+ tableDatass.value = ''
+ }
if (data.inkageEntity != null) {
- inkageEntity.value = data.inkageEntity == 1 ? '#911005' : 'green';
+ inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
}
if (data.requestEntity != null) {
- requestEntity.value = data.requestEntity == 1 ? '#911005' : 'green';
+ requestEntity.value = data.requestEntity == 1 ? 'green' : '#911005';
}
if (data.mesReplyEntity != null) {
- mesReplyEntity.value = data.mesReplyEntity == 1 ? '#911005' : 'green';
+ mesReplyEntity.value = data.mesReplyEntity == 1 ? 'green' : '#911005';
}
if (data.outInkageEntity != null) {
- outInkageEntity.value = data.outInkageEntity == 1 ? '#911005' : 'green';
+ outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005';
}
if (data.outRequestEntity != null) {
- outRequestEntity.value = data.outRequestEntity == 1 ? '#911005' : 'green';
+ outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
}
if (data.scanGlass != null) {
scanGlass.value = data.scanGlass[0];
@@ -876,31 +850,168 @@
ganghua.value = ''
}
if(data.bigStorageCageInfos!=null){
- window.localStorage.setItem('length', data.bigStorageCageInfos[0][1].length)
- let length = window.localStorage.getItem('length')
- adjustedRects.value = data.bigStorageCageInfos[0][1].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-adjustedRectsa.value = data.bigStorageCageInfos[0][2].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-adjustedRectsb.value = data.bigStorageCageInfos[0][3].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-adjustedRectsc.value = data.bigStorageCageInfos[0][4].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
+ adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCounts.value = data.bigStorageCageInfos[0][1].map(rect => rect.count);
+adjustedRectsa.value = data.bigStorageCageInfos[0][2].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCountsa.value = data.bigStorageCageInfos[0][2].map(rect => rect.count);
+adjustedRectsb.value = data.bigStorageCageInfos[0][3].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCountsb.value = data.bigStorageCageInfos[0][3].map(rect => rect.count);
+adjustedRectsc.value = data.bigStorageCageInfos[0][4].map((rect, index) => ({
+ id: index + 1,
+ height: 20/55,
+ top: 53/55,
+ }));
+subRectsCountsc.value = data.bigStorageCageInfos[0][4].map(rect => rect.count);
}else{
- adjustedRects.value = ''
+ adjustedRects.value = '',
+ adjustedRectsa.value = '',
+ adjustedRectsb.value = '',
+ adjustedRectsc.value = ''
}
+};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStyle = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRects = (rectIndex) => {
+ const count = subRectsCounts.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+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}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStylea = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsa = (rectIndex) => {
+ const count = subRectsCountsa.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+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}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStyleb = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsb = (rectIndex) => {
+ const count = subRectsCountsb.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+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}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginRight,
+ top: '0px',
+ backgroundColor: '#911005',
+ right,
+ };
+};
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStylec = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ right: '0px',
+ top: `${index*rect.top}px`,
+ height: `${rect.height}px`,
+});
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectsc = (rectIndex) => {
+ const count = subRectsCountsc.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,
+ };
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
@@ -960,6 +1071,28 @@
return t('searchOrder.waiting');
}
}
+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();
});
@@ -1007,6 +1140,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" />
@@ -1015,6 +1149,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>
@@ -1033,7 +1174,7 @@
</div>
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
- <div class="img-car1" :style="'z-index:999;left:270px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
+ <div class="img-car1" :style="'z-index:999;left:290px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -1047,7 +1188,7 @@
>
</div>
</div>
- <div class="img-car4" :style="'z-index:999;left:740px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
+ <div class="img-car4" :style="'z-index:999;left:735px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjust"
:key="rect.id"
@@ -1062,254 +1203,59 @@
</div>
</div>
<div style="position: relative;">
- <div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:50px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRects"
- :key="rect"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
+ <div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 525px;">
+ <div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRects(rectIndex)"
+ :key="subIndex"
+ :style="subRectStyle(rectIndex, subIndex)"
+ ></div>
</div>
</div>
- <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:51px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsa"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
+ <div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:67px;left: 525px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
+ :key="subIndex"
+ :style="subRectStylea(rectIndex, subIndex)"
+ ></div>
</div>
</div>
- <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:110px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsb"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
+ <div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:72px;left: 525px;">
+ <div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
+ :key="subIndex"
+ :style="subRectStyleb(rectIndex, subIndex)"
+ ></div>
</div>
</div>
- <div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:140px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsc"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
- </div>
- </div>
- <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:170px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsd"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
- </div>
- </div>
- <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:241px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectse"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
- </div>
- </div>
- <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:271px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsf"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
- </div>
- </div>
- <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:301px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsg"
- :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 v-show="cell9" style="width: 227px;height: 29px;position: absolute;top:332px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsh"
- :key="rect.id"
- :style="{
- position: 'absolute',
- width: '227px',
- 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',
- top: '0px',
- marginRight: rects.gap/5000*227+'px'
- }"
- >
- </div>
+ <div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:77px;left: 525px;">
+ <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>
</div>
+<el-card style="flex: 1;margin-left: 1220px;margin-top: -510px;" v-loading="loading">
+ <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
+ <el-table height="420px" ref="table" border
+ :data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="engineerId" align="center" :label="$t('Mounting.project')" min-width="140" />
+ <el-table-column prop="countTemp" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="120" />
+ <el-table-column prop="countGlass" align="center" :label="$t('searchOrder.cagesnumber')" min-width="120" />
+ <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="120" />
+ <el-table-column prop="fullTemp" align="center" :label="$t('searchOrder.fullfurnaces')" min-width="120" />
+ <el-table-column prop="countSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="120" />
+ <el-table-column prop="percent" align="center" :label="$t('searchOrder.progress')" min-width="120" />
+ </el-table>
+ </div>
+ </el-card>
+
</div>
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
<div style="margin-bottom: 20px">
@@ -1374,8 +1320,8 @@
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
<div style="display: flex;">
- <el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
- <el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="flowCardId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
+ <el-input v-model="filmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchxianga">
{{$t('reportmanage.inquire')}}</el-button>
</div>
@@ -1572,7 +1518,6 @@
<el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
<el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
<el-button size="mini" type="text" plain @click="handlelack(scope.row)">{{ $t('searchOrder.lacknumber') }}</el-button>
- <el-button size="mini" type="text" plain @click="handlespecifyengineerid(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
<el-button size="mini" type="text" plain @click="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
@@ -1666,12 +1611,13 @@
<el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
<el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
<el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150" />
+ <el-table-column prop="slot" fixed align="center" :label="$t('film.slot')" min-width="150" />
<el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
<el-table-column prop="temperingFeedSequence" fixed align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
<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" />
<el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
- <el-table-column prop="filmsid" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+ <el-table-column prop="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
<el-table-column
align="center"
:label="$t('searchOrder.state')"
@@ -1785,7 +1731,7 @@
:printGlassId="printGlassId" style=""/>
</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{
@@ -1879,7 +1825,7 @@
.img-dlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('../../assets/dlpl9.png');
+ background-image:url('../../assets/ganghuaqian.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 400px;
@@ -1891,7 +1837,7 @@
}
.img-car1{
display: flex;
- background-image:url('../../assets/lp9.png');
+ background-image:url('../../assets/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1904,7 +1850,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/lpa9.png');
+ background-image:url('../../assets/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1931,4 +1877,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