From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Slicecage/slicecage.vue | 1234 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 609 insertions(+), 625 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index d713987..41ecca8 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()
@@ -17,8 +17,16 @@
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
+const dialogFormVisibled = ref(false)
+const dialogFormVisiblee = ref(false)
+const dialogFormVisiblef = ref(false)
const dialogFormVisibles = ref(false)
-const tableData = ref([])
+const inkageEntity = ref('#911005');
+const requestEntity = ref('#911005');
+const mesReplyEntity = ref('#911005');
+const outInkageEntity = ref('#911005');
+const outRequestEntity = ref('#911005');
+const tableDataa = ref([])
const tableDatagh = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
@@ -27,25 +35,29 @@
const tableDatae = ref([])
const tableDatax = ref([])
const tableDatas = ref([])
+const tableDatalack = ref([])
+const tableDataspecify = ref([])
+const tableDatacagedetails = ref([])
const carPosition = ref([])
const ganghua = ref('')
const diaodu = ref('')
-const adjustedRects = ref([]);
+const flowCardId = ref('')
+const filmsId = 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({});
const add = ref(false)
-const flowCardId = ref('');
const gap = ref('');
const glassId = ref('');
const glassType = ref('');
@@ -56,101 +68,21 @@
const temperingLayoutId = ref('');
const thickness = ref('');
const width = ref('');
-const timers1 =ref(true);
-const timers2 =ref(true);
-const timers3 =ref(true);
-const timers4 =ref(true);
-const cellshow5=ref(false);
-const cellshow1=ref(true);
-const cellshow2=ref(true);
-const cellshow3=ref(true);
-const cellshow4=ref(true);
-const million=ref(0);
-const million1=ref(0);
-const million3=ref(0);
-const million4=ref(0);
const cell1=ref(true);
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 selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
+const canEdit = ref(true);
+const selectedRow = ref(null);
const temperingtotal = ref(0);
const glasstotal = ref(0);
const fulltotals = ref(0);
const temperingengineerId=ref('');
- // 褰撳墠椤电爜鍜屾瘡椤垫樉绀虹殑鏉℃暟
- const currentPage = ref(1);
- const itemsPerPage = computed(() => {
- if (currentPage.value === 1) {
- return 55;
- } else if (currentPage.value === 2) {
- return 55;
- } else if (currentPage.value === 3) {
- return 55;
- } else if (currentPage.value === 4) {
- return 55;
- } else if (currentPage.value === 5) {
- return 55;
- } else if (currentPage.value === 6) {
- return 25;
- } else if (currentPage.value === 7) {
- return 30;
- } else if (currentPage.value === 8) {
- return 25;
- } else {
- return 25; // 榛樿鍊硷紝鍙互鏍规嵁瀹為檯闇�姹備慨鏀�
- }
- });
-
- // 璁＄畻鍒嗛〉鍚庣殑鏁版嵁
- const paginatedUsers = computed(() => {
- const startIndex = calculateStartIndex();
- const endIndex = startIndex + itemsPerPage.value;
- return tableData.value.slice(startIndex, endIndex);
- });
-
- // 璁＄畻褰撳墠椤电殑璧峰绱㈠紩
- function calculateStartIndex() {
- let index = 0;
- for (let i = 1; i < currentPage.value; i++) {
- if (i === 1) {
- index += 55;
- } else if (i === 2) {
- index += 55;
- } else if (i === 3) {
- index += 55;
- }else if (i === 4) {
- index += 55;
- }else if (i === 5) {
- index += 55;
- }else if (i === 6) {
- index += 25;
- }else if (i === 7) {
- index += 30;
- }else if (i === 8) {
- index += 25;
- } else {
- index += 25;
- }
- }
- return index;
- }
- function jumpToPage(page: number) {
- if (page >= 1 && page <= totalPages.value) {
- currentPage.value = page;
- }
-}
const printFlowCardId = ref('')
const printLayer = ref('')
const printGlassId = ref('')
const dialogTableVisible1 = ref(false)
const open1 = async (row) => {
-
printFlowCardId.value = row.flowCardId;
printLayer.value = row.layer
printGlassId.value = row.glassId
@@ -160,18 +92,15 @@
//dialogTableVisible1.value = false;
}, 1000);
}
-
const printFlowCard1 = () => {
// 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
let el = document.getElementById("printFlowCard");
let doc = document;
let body = doc.body || doc.getElementsByTagName("body")[0];
let printId = "print-" + Date.now();
-
// 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
let content = doc.createElement("div");
content.id = printId;
-
// 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
let style = doc.createElement("style");
style.innerHTML =
@@ -190,7 +119,6 @@
content.innerHTML = el.outerHTML;
// // console.log("el.outerHTML", el.outerHTML);
body.appendChild(style);
-
// 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
// 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
body.appendChild(content);
@@ -200,47 +128,16 @@
body.removeChild(style);
}, 20);
}
- // 涓婁竴椤靛拰涓嬩竴椤垫柟娉�
- const prevPage = () => {
- if (currentPage.value > 1) {
- currentPage.value--;
- }
- };
-
- const nextPage = () => {
- if (currentPage.value < totalPages.value) {
- currentPage.value++;
- }
- };
-
- // 鎬婚〉鏁拌绠�
- const totalPages = computed(() => {
- // let total = 0;
- // for (let i = 1; i <= users.value.length; i++) {
- // if (i === 1) {
- // total += 1;
- // } else if (i === 2) {
- // total += 2;
- // } else if (i === 3) {
- // total += 5;
- // } else {
- // total += 10;
- // }
- // }
- return 9;
- });
- setInterval(() => {
- localStorage.clear(); // 娓呴櫎鎵�鏈塴ocalStorage鏁版嵁
-}, 60000);
+// setInterval(() => {
+// localStorage.clear(); // 娓呴櫎鎵�鏈塴ocalStorage鏁版嵁
+// }, 60000);
// function cleanUp() {
// }
// // 鍋囪鎴戜滑姣�2鍒嗛挓鎵ц涓�娆℃竻鐞�
// setInterval(cleanUp, 1 * 60 * 1000);
-
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
break
}
@@ -250,13 +147,19 @@
}
}
}
+const handlePageChange2 = (newPage) => {
+ currentPage2.value = newPage;
+ console.log(currentPage2.value);
+ window.localStorage.setItem('pagenumber', currentPage2.value)
+ fetchxiang(currentPage2.value);
+};
const handleBindRack = (row) => {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
currentRow.deviceId = row.deviceId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�
currentRow.slot = row.slot;
window.localStorage.setItem('deviceId', row.deviceId)
window.localStorage.setItem('slot', row.slot)
- add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ add.value = true;
};
// 鎼滅储
const searchout = async () => {
@@ -265,16 +168,12 @@
glassId:glassId.value
});
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
tableDataf.value = response.data;
ElMessage.success(response.message);
-
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
} catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
};
@@ -290,6 +189,22 @@
}
row.enableState = newState;
};
+// 鏄惁鐮存崯
+const broken = async (row) => {
+ try {
+ const newState = row.isDamage === 1 ? 0 : 1;
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/bigStorageGlassDamageByGlassId', { glassId: row.glassId });
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ row.isDamage = newState;
+}
+catch (error) {
+ console.error(error);
+ }
+}
// 鍒犻櫎
const opena = async(row) => {
try {
@@ -302,20 +217,16 @@
type: 'warning',
}
);
- if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/deleteBigStorageCageDetails",row)
if (response.code === 200) {
- tableData.value = response.data;
+ tableDataa.value = response.data;
ElMessage.success(response.message);
- } else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ } else {
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
- } catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ } catch (error) {
console.error('鍙戠敓閿欒:', error);
}
};
@@ -334,7 +245,7 @@
if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+8, row)
if (response.code === 200) {
- tableData.value = response.data;
+ tableDataa.value = response.data;
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
@@ -359,7 +270,7 @@
if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+9, row)
if (response.code === 200) {
- tableData.value = response.data;
+ tableDataa.value = response.data;
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
@@ -381,8 +292,7 @@
type: 'warning',
}
);
- if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/outBigStorageCageDetails", row)
if (response.code === 200) {
ElMessage.success(response.message);
@@ -432,8 +342,8 @@
);
if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/TemperingGlass",{
- engineerId: row.engineer_id,
- temperingLayoutId: row.tempering_layout_id,
+ engineerId: row.engineerId,
+ temperingLayoutId: row.temperingLayoutId,
temperingFeedSequence:temperingFeedSequence
});
if (response.code === 200) {
@@ -459,10 +369,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 {
@@ -473,7 +381,7 @@
console.error('鍙戠敓閿欒:', error);
}
};
-// 鎸囧畾宸ョ▼
+// 鍙栨秷鎸囧畾
const broked = async() => {
try {
const confirmResult = await ElMessageBox.confirm(
@@ -622,9 +530,9 @@
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) {
- tableData.value = response.data;
+ tableDataa.value = response.data;
add.value = false;
ElMessage.success(response.message);
glassId.value = '';
@@ -635,51 +543,145 @@
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
const handlezhiban = () => {
- dialoglea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ dialoglea.value = true;
fetchFlowCardId();
};
const handleganghua = () => {
- dialogFormVisiblec.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ dialogFormVisiblec.value = true;
fetchFlow();
};
+const handlexiang = () => {
+ dialogFormVisiblea.value = true;
+ fetchxiang(1);
+ currentPage2.value = 1;
+ window.localStorage.setItem('pagenumber', currentPage2.value)
+ filmsId.value = ''
+ flowCardId.value = ''
+};
+// 缂虹墖鏁伴噺
+const handlelack = (row) => {
+ const { engineerId, temperingLayoutId } = row;
+ fetchlack(engineerId, temperingLayoutId);
+ dialogFormVisibled.value = true;
+};
+// 绗煎唴璇︽儏
+const handlecagedetails = (row) => {
+ const { engineerId, temperingLayoutId } = row;
+ fetchcagedetails(engineerId, temperingLayoutId);
+ dialogFormVisiblef.value = true;
+};
// 閽㈠寲鏌ヨ
-
onMounted(async () => {
try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectTemperingGlass');
+ var url="/cacheVerticalGlass/bigStorageCageDetails/selectTemperingGlass?isTempering="+1;
+ const response = await request.post(url)
if (response.code === 200) {
+ ElMessage.success(response.message);
tableDatagh.value = response.data
} else {
ElMessage.warning(response.msg)
}
- } catch (error) {
- // console.error('Error fetching rects :', error);
- }
-
-
+ } catch (error) {
+ }
});
+// 鐞嗙墖绗间俊鎭�
+const fetchxiang = async (page) => {
+ try {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCage/querybigStorageCageDetail',{
+ deviceId: page,
+ filmsId: filmsId.value,
+ flowCardId: flowCardId.value,
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ tableDataa.value = response.data
+ } else {
+ ElMessage.warning(response.msg)
+ }
+ } catch (error) {
+ }
+}
+const fetchxianga = async () => {
+ let page = window.localStorage.getItem('pagenumber')
+ try {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCage/querybigStorageCageDetail',{
+ deviceId: page,
+ filmsId: filmsId.value,
+ flowCardId: flowCardId.value,
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ tableDataa.value = response.data
+ // filmsId.value = ''
+ // flowCardId.value = ''
+ } else {
+ ElMessage.warning(response.msg)
+ }
+ } catch (error) {
+ }
+}
+// 闈為挗鍖栨祦绋嬪崱
const fetchFlows = async () => {
try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectFlowCardByCache');
+ var url="/cacheVerticalGlass/bigStorageCageDetails/selectTemperingGlass?isTempering="+0;
+ const response = await request.post(url)
if (response.code === 200) {
+ ElMessage.success(response.message);
tableDatas.value = response.data
} else {
ElMessage.warning(response.msg)
}
- } catch (error) {
- // console.error('Error fetching rects :', error);
+ } catch (error) {
}
}
-
-
+// 缂虹墖鏁伴噺
+const fetchlack = async (engineerId, temperingLayoutId) => {
+ try {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/queryLackGlassInfo',{
+ engineerId: engineerId,
+ temperingLayoutId: temperingLayoutId,
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableDatalack.value = response.data
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 绗煎唴璇︽儏
+const fetchcagedetails = async (engineerId, temperingLayoutId) => {
+ try {
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/queryRealGlassInfo',{
+ engineerId: engineerId,
+ temperingLayoutId: temperingLayoutId,
+ })
+ if (response.code == 200) {
+ console.log(response.data);
+
+ ElMessage.success(response.message);
+ tableDatacagedetails.value = response.data
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
const fetchFlow = async () => {
try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectTemperingGlass')
+ var url="/cacheVerticalGlass/bigStorageCageDetails/selectTemperingGlass?isTempering="+1;
+ const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
tableDatagh.value = response.data
@@ -687,8 +689,8 @@
let totalCount = 0;
let fullCount = 0;
response.data.forEach(item => {
- totalCount += item.count1 || 0;
- if(item.count2-item.count1-item.count4==0){
+ totalCount += item.realCount || 0;
+ if(item.lackCount==0){
fullCount+=1;
}
});
@@ -720,7 +722,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -740,13 +741,12 @@
const handleChange = async () => {
try {
const body = {
- flag: ganghua.value, // 浣跨敤 ganghua.value 鑾峰彇褰撳墠寮�鍏崇殑鐘舵��
+ flag: ganghua.value,
};
var url="/cacheVerticalGlass/bigStorageCageDetails/temperingSwitch?flag="+ganghua.value;
const response = await request.post(url)
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
ganghua.value = response.data
}else {
@@ -754,7 +754,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -763,12 +762,10 @@
try {
const body = {
flag: diaodu.value,
- };
-
+ };
var url="/cacheVerticalGlass/bigStorageCageDetails/dispatchSwitch?flag="+diaodu.value;
const response = await request.post(url)
if (response.code == 200) {
- // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
diaodu.value = response.data
}else {
@@ -776,15 +773,28 @@
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
- if (data.scanGlass != null) {
+ if (data.inkageEntity != null) {
+ inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
+ }
+ if (data.requestEntity != null) {
+ requestEntity.value = data.requestEntity == 1 ? 'green' : '#911005';
+ }
+ if (data.mesReplyEntity != null) {
+ mesReplyEntity.value = data.mesReplyEntity == 1 ? 'green' : '#911005';
+ }
+ if (data.outInkageEntity != null) {
+ outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005';
+ }
+ if (data.outRequestEntity != null) {
+ outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
+ }
+ if (data.scanGlass != null) {
scanGlass.value = data.scanGlass[0];
let width = scanGlass.value.width;
let height = scanGlass.value.height;
@@ -800,13 +810,9 @@
if(data.bigStorageCageDetailsOutTask!=null){
temperingengineerId.value=data.temperingengineerId[0];
}
- // 鏇存柊 tableData 鐨勬暟鎹�
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
- console.log(data.bigStorageCageDetailsOutTask[0])
adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
- // console.log(data.bigStorageCageDetailsOutTask[0]);
-
} else {
tableDatac.value = '',
adjusta.value = ''
@@ -817,22 +823,8 @@
}else{
tableDatad.value = ''
}
-
- // adjust.value = data.bigStorageCageDetailsFeedTask[0].map(rect => ({
- // ...rect,
- // }));
-
-// const adjust = computed(() => {
-// return data.value.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
-// });
-if(data.bigStorageCageInfo!=null){
- tableData.value = data.bigStorageCageInfo[0]
-}else{
- tableData.value = ''
- }
if(data.temperingGlassInfoList!=null){
tableDatab.value = data.temperingGlassInfoList[0]
- console.log(tableDatab.value)
}else{
tableDatab.value = ''
}
@@ -851,65 +843,171 @@
}else{
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
- }));
-adjustedRectsd.value = data.bigStorageCageInfos[0][5].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-adjustedRectse.value = data.bigStorageCageInfos[0][6].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-adjustedRectsf.value = data.bigStorageCageInfos[0][7].map(rect => ({
- ...rect,
- height: 20/length,
- top: 29/length
- }));
-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
- }));
+ 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 = ''
}
-
-
};
-// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
+// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
+const rectStyle = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ left: '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 marginLeft = '8px';
+ 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 rectStylea = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ left: '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 marginLeft = '8px';
+ 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 rectStyleb = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ left: '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 marginLeft = '8px';
+ 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 rectStylec = (rect, index) => ({
+ position: 'absolute',
+ width: '170px',
+ left: '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 marginLeft = '8px';
+ 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,
+ };
+};
onMounted(() => {
- // fetchFlowCardId();
- // initializeWebSocket(socketUrl, handleMessage);
socket = initializeWebSocket(socketUrl, handleMessage);
});
onUnmounted(() => {
@@ -968,15 +1066,12 @@
}
}
onBeforeUnmount(() => {
- // console.log("鍏抽棴浜�")
closeWebSocket();
});
-
</script>
-
<template>
<div style="height: 600px;">
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">{{ $t('searchOrder.cageinformation') }}</el-button>
+ <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="handlexiang">{{ $t('searchOrder.cageinformation') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">{{ $t('searchOrder.productionqueue') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
@@ -986,6 +1081,18 @@
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary"
@click="dialogFormVisibleaDownGlasss = true">{{ $t('searchOrder.Labelprinting') }}
</el-button>
+ <div id="dotClass">
+ <div>{{ $t('searchOrder.inkageEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: inkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('searchOrder.requestEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: requestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('searchOrder.mesReplyEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: mesReplyEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('searchOrder.outInkageEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: outInkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ <div style="margin-left: 70px;">{{ $t('searchOrder.outRequestEntity') }}</div>
+ <i :style="{ marginTop: '2px', backgroundColor: outRequestEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
+ </div>
<div class="table-container">
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;">
@@ -1031,7 +1138,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:375px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjusta"
:key="rect.id"
@@ -1045,7 +1152,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:770px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjust"
:key="rect.id"
@@ -1060,282 +1167,40 @@
</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="{
-
- // 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 v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 585px;">
+ <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="{
-
- // 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 v-show="cell2" style="width: 170px;height: 53px;position: relative;top:67px;left: 585px;">
+ <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="{
- // 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 v-show="cell3" style="width: 170px;height: 53px;position: relative;top:72px;left: 585px;">
+ <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="{
-
- // 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="cell5" style="width: 227px;height: 29px;position: absolute;top:170px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsd"
- :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="cell6" style="width: 227px;height: 29px;position: absolute;top:241px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectse"
- :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="cell7" style="width: 227px;height: 29px;position: absolute;top:271px;left: 495px;">
- <div
- v-for="(rect, index) in adjustedRectsf"
- :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="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="{
-
- // 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 v-show="cell4" style="width: 170px;height: 53px;position: relative;top:77px;left: 585px;">
+ <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>
@@ -1349,7 +1214,6 @@
<div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('searchOrder.tida')" style="width: 14vw">
{{ currentRow.deviceId }}
- <!-- <el-input v-model="currentRow.id" autocomplete="off"></el-input> -->
</el-form-item>
</div>
</el-col>
@@ -1357,7 +1221,6 @@
<div id="dta" style="font-size: 15px;">
<el-form-item :label="$t('searchOrder.gridnumbera')" style="width: 14vw">
{{ currentRow.slot }}
- <!-- <el-input v-model="currentRow.slot" autocomplete="off"></el-input> -->
</el-form-item>
</div>
</el-col>
@@ -1369,7 +1232,6 @@
</el-input>
<el-button type="primary" plain style="margin-left: 10px;" @click="searchout">{{ $t('searchOrder.search') }}</el-button>
</div>
-
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
<el-table height="100%" ref="table"
:data="tableDataf" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
@@ -1397,7 +1259,6 @@
</template>
</el-table-column>
<el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150"/>
- <!-- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150"/> -->
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
<template #default="scope">
<el-button size="mini" type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
@@ -1407,8 +1268,14 @@
</div>
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
+ <div style="display: flex;">
+ <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>
<el-table
- :data="paginatedUsers"
+ :data="tableDataa"
@row-click="handleRowClick"
height="700"
@expand-change="handleExpandChange"
@@ -1427,10 +1294,10 @@
: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="130"/>
- <!-- <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="130" /> -->
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" 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="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" min-width="80" />
+ <!-- <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" />
<el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
@@ -1441,7 +1308,6 @@
:label="$t('searchOrder.startstatus')"
min-width="80"
prop="state"
-
>
<template #default="scope">
<el-tag :type="getStatusType(scope.row.state)">
@@ -1493,43 +1359,23 @@
</el-table-column>
</el-table>
<div>
- <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>
-
- <!-- 褰撳墠椤垫樉绀虹殑鏉℃暟 -->
- <span style="margin-left: 10px;">{{ $t('searchOrder.now') }} {{ itemsPerPage }} {{ $t('searchOrder.tit') }}</span>
+ <div style="margin-top: 20px;margin-left: 40%;">
+ <el-pagination
+ background
+ size="large"
+ layout="prev, pager, next"
+ :total="40"
+ :current-page.sync="currentPage2"
+ @current-change="handlePageChange2"
+ />
</div>
</div>
- </el-dialog>
-<!-- </el-dialog> -->
+ </el-dialog>
<el-dialog v-model="dialogFormVisibleb" top="5vh" width="85%" :title="$t('searchOrder.productionqueue')">
- <!-- <div style="display: flex;">
- <p style="margin-top: 3px;">闃熷垪鐘舵�侊細</p>
- <p style="margin-top: 3px;">寮�濮�</p>
- <el-button style="margin-left: 10px;size: mini;" type="danger">鍋滄</el-button>
- <el-button style="margin-left: 10px;size: mini;" type="primary">娣诲姞</el-button>
- </div> -->
<el-table ref="table" style="margin-top: 20px;height: 700px;"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <!-- <el-table-column prop="id" fixed align="center" :label="$t('searchOrder.sheetID')" min-width="150"/>
- -->
<el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="150"/>
-
<el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.processcards')" min-width="120" />
- <!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.processcardtype')" min-width="150" /> -->
<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" />
@@ -1563,13 +1409,6 @@
</el-tag>
</template>
</el-table-column>
- <!-- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
- <template #default="scope">
- <el-button size="mini" type="text" plain @click="brokea(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokeb(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
- <el-button size="mini" type="text" plain @click="deletea(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
- </template>
- </el-table-column> -->
</el-table>
</el-dialog>
<el-dialog v-model="dialogFormVisiblec" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
@@ -1614,19 +1453,147 @@
</div>
<el-table ref="table" style="margin-top: 20px;height: 500px;"
:data="tableDatagh" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="engineer_id" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
- <el-table-column prop="tempering_layout_id" fixed align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
- <el-table-column prop="count2" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
- <el-table-column prop="count1" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
- <el-table-column prop="count3" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
- <el-table-column prop="count4" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="250">
+ <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
+ <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
+ <el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
+ <el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
+ <el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
+ <el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
<el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
<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="handlecagedetails(scope.row)">{{ $t('searchOrder.cagedetails') }}</el-button>
</template>
</el-table-column>
+ </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisibled" top="5vh" width="85%" :title="$t('hellow.missingnumber')">
+ <el-table ref="table" style="margin-top: 20px;height: 600px;"
+ :data="tableDatalack" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <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="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
+ align="center"
+ :label="$t('searchOrder.state')"
+ min-width="80"
+ prop="isDamage"
+ >
+ <template #default="scope">
+ <div
+ @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+ style="position: relative; display: inline-block;"
+ >
+ <el-tag
+ :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+ style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+ >
+ {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+ </el-tag>
+ <div
+ v-if="scope.row.isDamage === 1"
+ style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+ ></div>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+ <el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+ <el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
+ </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisiblee" top="5vh" width="85%" :title="$t('searchOrder.specifyengineerid')">
+ <el-table ref="table" style="margin-top: 20px;height: 600px;"
+ :data="tableDataspecify" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <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="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
+ align="center"
+ :label="$t('searchOrder.state')"
+ min-width="80"
+ prop="isDamage"
+ >
+ <template #default="scope">
+ <div
+ @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+ style="position: relative; display: inline-block;"
+ >
+ <el-tag
+ :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+ style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+ >
+ {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+ </el-tag>
+ <div
+ v-if="scope.row.isDamage === 1"
+ style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+ ></div>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+ <el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+ <el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
+ </el-table>
+</el-dialog>
+<el-dialog v-model="dialogFormVisiblef" top="5vh" width="85%" :title="$t('searchOrder.cagedetails')">
+ <el-table ref="table" style="margin-top: 20px;height: 600px;"
+ :data="tableDatacagedetails" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <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
+ align="center"
+ :label="$t('searchOrder.state')"
+ min-width="80"
+ prop="isDamage"
+ >
+ <template #default="scope">
+ <div
+ @click="scope.row.isDamage === 1 ? null : broken(scope.row)"
+ style="position: relative; display: inline-block;"
+ >
+ <el-tag
+ :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+ style="pointer-events: {{ scope.row.isDamage === 1 ? 'none' : 'auto' }};"
+ >
+ {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+ </el-tag>
+ <div
+ v-if="scope.row.isDamage === 1"
+ style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: transparent; z-index: 1;"
+ ></div>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+ <el-table-column prop="xcoordinate" align="center" :label="$t('searchOrder.xcoordinates')" min-width="80" />
+ <el-table-column prop="ycoordinate" align="center" :label="$t('searchOrder.ycoordinates')" min-width="80" />
</el-table>
</el-dialog>
<el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">
@@ -1654,20 +1621,39 @@
</div>
</template>
</el-dialog>
-<el-dialog v-model="dialogFormVisibles" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
- <el-table ref="table" style="margin-top: 20px;height: 500px;"
+<el-dialog v-model="dialogFormVisibles" top="5vh" width="85%" :title="$t('searchOrder.searchlayout')">
+ <el-table ref="table" style="margin-top: 20px;height: 500px;"
+ :data="tableDatas" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
+ <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
+ <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
+ <el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
+ <el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
+ <el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
+ <el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="250">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <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('hellow.missingnumber') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- <el-table ref="table" style="margin-top: 20px;height: 500px;"
:data="tableDatas" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="flow_card_id" fixed align="center" :label="$t('searchOrder.processcards')"/>
<el-table-column prop="layer" align="center" :label="$t('searchOrder.ceng')" />
<el-table-column prop="count" align="center" :label="$t('searchOrder.numberglasses')" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" >
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokes(scope.row)">鎸囧畾娴佺▼鍗�</el-button>
+ <el-button size="mini" type="text" plain @click="brokes(scope.row)">{{ $t('searchOrder.processcard') }}</el-button>
</template>
</el-table-column>
- </el-table>
+ </el-table> -->
</el-dialog>
-<el-dialog v-model="dialogFormVisibleaDownGlasss" top="2vh" width="97%" :title="$t('浜哄伐涓嬬墖淇℃伅')">
+<el-dialog v-model="dialogFormVisibleaDownGlasss" top="2vh" width="97%" :title="$t('searchOrder.filminformation')">
<div style="display:flex;justify-content: space-around;">
<el-card
style="display: flex; justify-content: center; align-items: center; width: 800px; height: 800px;position: relative;">
@@ -1676,16 +1662,15 @@
</div>
<div style="font-size: 50px; text-align: center;position: absolute;top:0px;left:200px;">
- <div>鎵爜鏋綋鍓嶇幓鐠冧俊鎭�</div>
+ <div>{{ $t('searchOrder.currentglassinformation') }}</div>
<div>
- <el-button type="primary" @click="open1(scanGlass)">鎵撳嵃鏍囩</el-button>
+ <el-button type="primary" @click="open1(scanGlass)">{{ $t('searchOrder.printlabels') }}</el-button>
</div>
<div>{{ scanGlass.flowCardId }}</div>
<div>{{ scanGlass.layer }}</div>
<div>{{ scanGlass.glassId }}</div>
<div>{{ scanGlass.width }}</div>
<div>{{ scanGlass.height }}</div>
-
</div>
</el-card>
</div>
@@ -1743,18 +1728,15 @@
width: 0 !important;height: 0;
}
.img-list{
-
position:relative;
}
.data-img{
@apply float-none ;
-
width:100%;
height:16rem;
background: rgba(0, 0, 0, 0);
opacity: 1;
border-radius: 0.5rem 0.5rem 0px 0px;
-
}
.check-img{
position: absolute;
@@ -1763,7 +1745,6 @@
top:20rem;
right: 57rem;
z-index: 10;
-
}
.check-imga{
position: absolute;
@@ -1772,7 +1753,6 @@
top:15rem;
right: 28.5rem;
z-index: 10;
-
}
.vertical {
width: 45px;
@@ -1783,7 +1763,6 @@
transform: translateX(-50%);
animation: move-vertical 6s infinite; /* 浠庝笂鍒颁笅鍔ㄧ敾锛屾寔缁�6绉掞紝鏃犻檺寰幆 */
}
-
@keyframes move-vertical {
0% {
top: 485px; /* 璧峰浣嶇疆 */
@@ -1792,54 +1771,59 @@
top: calc(100% - 210px); /* 浠庝笂鍒颁笅缁撴潫浣嶇疆 */
}
}
-
.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;
- width: 1200px;
- max-width: 100%;
- background-size: 1200px 400px;
- overflow: hidden;
- position:relative
+ background-attachment: local;
+ min-height: 400px;
+ width: 1200px;
+ max-width: 100%;
+ background-size: 1200px 400px;
+ overflow: hidden;
+ position:relative
}
.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;
- min-height: 200px;
- width: 200px;
- max-width: 100%;
- background-size: 200px 70px;
- overflow: hidden;
- position:relative
+ background-attachment: local;
+ min-height: 200px;
+ width: 200px;
+ max-width: 100%;
+ background-size: 200px 70px;
+ overflow: hidden;
+ position:relative
}
.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;
- min-height: 200px;
- width: 200px;
- max-width: 100%;
- background-size: 200px 70px;
- overflow: hidden;
- position:relative
+ background-attachment: local;
+ min-height: 200px;
+ width: 200px;
+ max-width: 100%;
+ background-size: 200px 70px;
+ overflow: hidden;
+ position:relative
}
.table-container {
display: flex;
flex-wrap: nowrap; /* 闃叉鎹㈣ */
justify-content: space-between; /* 鏍规嵁闇�瑕佽皟鏁村瓙鍏冪礌涔嬮棿鐨勯棿璺� */
}
-
.table-container > el-card {
flex: 1; /* 浣夸袱涓崱鐗囧钩鍒嗗彲鐢ㄧ┖闂� */
margin-bottom: 10px; /* 鍙�夛紝鏍规嵁闇�瑕佹坊鍔犲簳閮ㄩ棿璺� */
}
+#dotClass {
+ display: flex;
+ margin-left: 20px;
+ size: 50px;
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0