From b35d91a275fe0929f3df19c6de78729369440a45 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 17 十二月 2024 16:52:02 +0800
Subject: [PATCH] 大理片笼样式更改，新增接口。上片更改（部分，不完善）
---
UI-Project/src/views/Returns/upreturns.vue | 56 ++++++-
UI-Project/src/views/Slicecage/slicecage.vue | 320 +++++++++++++++++++++++++++------------------
UI-Project/src/lang/en.js | 6
UI-Project/src/lang/py.js | 6
UI-Project/src/lang/zh.js | 6
5 files changed, 245 insertions(+), 149 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index aa7d807..1899cd1 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -110,12 +110,14 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ breakagn:'鏈牬鎹�',
+ lacknumber:'缂虹墖鏁伴噺',
processcard:'鎸囧畾娴佺▼鍗�',
filminformation:'浜哄伐涓嬬墖淇℃伅',
currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
printlabels:'鎵撳嵃鏍囩',
- deleteTask:'鍒犻櫎宸ョ▼',
- pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
+ deleteTask:'缁撴潫宸ョ▼',
+ pdeleteTask:'鏄惁缁撴潫宸ョ▼锛�',
searchlayout:'Non-tempered process card inquiry',
fullfurnaces:'Number of full furnaces',
specifiedproject:'The currently specified project',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 37b5d18..bdd93f2 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -110,12 +110,14 @@
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ breakagn:'鏈牬鎹�',
+ lacknumber:'缂虹墖鏁伴噺',
processcard:'鎸囧畾娴佺▼鍗�',
filminformation:'浜哄伐涓嬬墖淇℃伅',
currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
printlabels:'鎵撳嵃鏍囩',
- deleteTask:'鍒犻櫎宸ョ▼',
- pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
+ deleteTask:'缁撴潫宸ョ▼',
+ pdeleteTask:'鏄惁缁撴潫宸ョ▼锛�',
searchlayout:'袟邪锌褉芯褋 薪械褌械屑锌械褉懈褉芯胁邪薪薪芯泄 褌械褏薪芯谢芯谐懈褔械褋泻芯泄 泻邪褉褌褘',
fullfurnaces:'袣芯谢懈褔械褋褌胁芯 锌芯谢薪褘褏 锌械褔械泄',
specifiedproject:'校泻邪蟹邪薪薪褘泄 胁 写邪薪薪褘泄 屑芯屑械薪褌 锌褉芯械泻褌',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 89cb7d2..e25ae17 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -110,12 +110,14 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ breakagn:'鏈牬鎹�',
+ lacknumber:'缂虹墖鏁伴噺',
processcard:'鎸囧畾娴佺▼鍗�',
filminformation:'浜哄伐涓嬬墖淇℃伅',
currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
printlabels:'鎵撳嵃鏍囩',
- deleteTask:'鍒犻櫎宸ョ▼',
- pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
+ deleteTask:'缁撴潫宸ョ▼',
+ pdeleteTask:'鏄惁缁撴潫宸ョ▼锛�',
searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
fullfurnaces:'婊＄倝鏁伴噺',
specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 2ae509f..595f20f 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -17,7 +17,11 @@
const blinda = ref(false)
const blindb = ref(false)
const dialoglea = ref(false)
+const canSelectProjecta = ref(true);
+const canSelectProjectb = ref(true);
+const canSelectProjectc = ref(false);
const tableDatax = ref([])
+const tableDatad = ref([])
const upstatus = ref(t('basicData.machineaa'));
const cuttingMachineStatusColor = ref('#911005');
const tableDataa = ref<any[]>([]);
@@ -61,16 +65,23 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
tableDataa.value = data.list[0].slice(0, 2);
+ if(data.loadTask1!=null){
+ tableData.value = data.loadTask1[0]
+ canSelectProjecta.value = false;
+ canSelectProjectb.value = false;
+ canSelectProjectc.value = true;
+}
};
onBeforeUnmount(() => {
closeWebSocket();
});
-// 鍒犻櫎
+// 缁撴潫宸ョ▼
const handledelete = (row) => {
blindb.value = true;
+ deleteTask()
};
const requestData = {
state: 100
@@ -115,7 +126,7 @@
console.error(error);
}
}
-// 鍒犻櫎
+// 缁撴潫宸ョ▼
const deleteTask = async () => {
try {
let engineeringId = window.localStorage.getItem('engineeringId')
@@ -126,7 +137,9 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- blindb.value = false;
+ tableDatad.value = response.data;
+ canSelectProjecta.value = true;
+ canSelectProjectc.value = false;
} else {
ElMessage.error(response.message);
}
@@ -157,6 +170,9 @@
if (response.code == 200) {
ElMessage.success(response.message);
blind.value = false;
+ canSelectProjecta.value = false;
+ canSelectProjectc.value = true;
+
} else {
ElMessage.error(response.message);
}
@@ -303,10 +319,10 @@
}}
</el-button>
</div>
- <el-button style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
+ <el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
+ <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
+ <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
<el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
style="margin-top: 5px;margin-left: 20px;">
@@ -382,17 +398,33 @@
</div>
</template>
</el-dialog>
-
- <el-dialog v-model="blindb" top="30vh" width="25%" :title="$t('searchOrder.pdeleteTask')">
- <template #footer>
+<!-- 缁撴潫宸ョ▼ -->
+ <el-dialog v-model="blindb" top="10vh" width="50%">
+ <el-table ref="table" style="margin-top: 20px;height: 300px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="line" fixed align="center" :label="$t('basicData.line')"/>
+ <el-table-column prop="workProcesses" fixed align="center" :label="$t('basicData.process')"/>
+ <el-table-column prop="teamsGroupsName" align="center" :label="$t('basicData.team')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ </el-table>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
+ </div>
+ </template>
+ <!-- <template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="deleteTask">
{{ $t('basicData.confirm') }}
</el-button>
<el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button>
</div>
- </template>
+ </template> -->
</el-dialog>
+ <!-- 鍊肩彮淇℃伅 -->
<el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">
<el-table ref="table" style="margin-top: 20px;height: 300px;"
:data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 956f434..4d17871 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -17,8 +17,9 @@
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
+const dialogFormVisibled = ref(false)
const dialogFormVisibles = ref(false)
-const tableData = ref([])
+const tableDataa = ref([])
const tableDatagh = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
@@ -27,9 +28,12 @@
const tableDatae = ref([])
const tableDatax = ref([])
const tableDatas = ref([])
+const tableDatalack = ref([])
const carPosition = ref([])
const ganghua = ref('')
const diaodu = ref('')
+const flowCardId = ref('')
+const filmsId = ref('')
const adjustedRects = ref([]);
const project = ref([]);
const adjust = ref([]);
@@ -43,9 +47,9 @@
const adjustedRectsg = ref([]);
const adjustedRectsh = 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('');
@@ -70,65 +74,6 @@
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('')
@@ -179,33 +124,6 @@
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);
@@ -225,6 +143,12 @@
}
}
}
+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; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�
@@ -261,6 +185,17 @@
}
row.enableState = newState;
};
+// 鏄惁鐮存崯
+const toggleEnableisDamage = async (row) => {
+ const newState = row.isDamage === 1 ? 0 : 1;
+ const response = await request.post('/cacheGlass/edgStorageCage/updateEdgStorageCage', { id: row.id, enableState: newState });
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ row.isDamage = newState;
+};
// 鍒犻櫎
const opena = async(row) => {
try {
@@ -276,7 +211,7 @@
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 {
ElMessage.error(response.message);
@@ -301,7 +236,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);
@@ -326,7 +261,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);
@@ -590,7 +525,7 @@
};
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 = '';
@@ -612,11 +547,27 @@
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;
+};
// 閽㈠寲鏌ヨ
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)
@@ -624,10 +575,49 @@
} 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)
@@ -635,9 +625,29 @@
} 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 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
@@ -751,7 +761,6 @@
if(data.bigStorageCageDetailsOutTask!=null){
temperingengineerId.value=data.temperingengineerId[0];
}
- // 鏇存柊 tableData 鐨勬暟鎹�
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
console.log(data.bigStorageCageDetailsOutTask[0])
@@ -767,11 +776,6 @@
}else{
tableDatad.value = ''
}
-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)
@@ -909,7 +913,7 @@
</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>
@@ -1304,8 +1308,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" 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-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"
@@ -1326,7 +1336,8 @@
<!-- <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="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" />
@@ -1388,23 +1399,15 @@
</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>
@@ -1490,19 +1493,55 @@
</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="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 prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="400">
<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-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="120" />
+ <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')" min-width="120" />
+ <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')" min-width="120" />
+ <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">
+ <el-tag
+ :type="scope.row.isDamage === 1 ? 'danger' : 'success'"
+ @click="toggleEnableisDamage(scope.row)"
+ >
+ {{ scope.row.isDamage === 1 ? $t('searchOrder.breakage') : $t('searchOrder.breakagn') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="isDamage" align="center" :label="$t('searchOrder.state')" min-width="80" /> -->
+ <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')">
@@ -1530,8 +1569,27 @@
</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="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 prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" 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')" />
@@ -1541,7 +1599,7 @@
<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('searchOrder.filminformation')">
<div style="display:flex;justify-content: space-around;">
--
Gitblit v1.8.0