From 9101ba64d5aa4722fc6384674682cd508d1315c9 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 11 十二月 2025 10:51:44 +0800
Subject: [PATCH] 报警弹窗新增提示信息
---
UI-Project/src/views/hollow/hollowslicecage.vue | 531 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 379 insertions(+), 152 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 6dded87..68ad819 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -29,6 +29,16 @@
const carPosition = ref([])
const tableDatass = ref([])
const tableDataLack = ref([])
+const tableDataMiss = ref([])
+// 鍝嶅簲寮忕姸鎬�
+const showAlert = ref(false)
+const alertMessage = ref('')
+const alarmData = ref<any>(null)
+const showModal = ref(false)
+const currentAlarm = ref<any>(null)
+const tableDataAlert = ref([])
+const alertText = ref('')
+const engineerId = ref('')
const ganghua = ref('')
const diaodu = ref('')
const hollowPriority = ref('')
@@ -36,6 +46,7 @@
const glassType = ref('')
const layer = ref('')
const filmsId = ref('')
+const thickness = ref('')
const adjust = ref([]);
const adjusta = ref([]);
const adjustedRects = ref([]);
@@ -43,11 +54,13 @@
const adjustedRectsb = ref([]);
const adjustedRectsc = ref([]);
const adjustedRectsd = ref([]);
+const adjustedRectse = ref([]);
const subRectsCounts = ref([]);
const subRectsCountsa = ref([]);
const subRectsCountsb = ref([]);
const subRectsCountsc = ref([]);
const subRectsCountsd = ref([]);
+const subRectsCountse = ref([]);
const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
const currentLack = reactive({});
const currentPage2 = ref(1)
@@ -74,14 +87,29 @@
window.localStorage.setItem('slot', row.slot)
add.value = true;
};
-// 缂虹墖璇︽儏
-// const handleMissingFilms = (row) => {
-// currentPage2.value = 1;
-// const { flowCardId } = row;
-// currentLack.flowCardId = row.flowCardId;
-// dialogFormVisibleb.value = true;
-// fetchFlowBind(flowCardId, currentPage2.value);
-// };
+// 澶氭潯鐮存崯鏁版嵁
+const handleMissingFilms = (row) => {
+ dialogFormVisibleb.value = true;
+ handleAllMissing(row)
+};
+const handleAllMissing = async (row) => {
+ try {
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryLackGlassByFlowCard', {
+ flowCardId: row.flowCardId,
+ layer: row.layer,
+ orderSort: row.glassType,
+ // glassId: row.glassId
+ });
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableDataMiss.value = response.data
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ }
+}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
fetchFlowBind(currentLack.flowCardId, currentPage2.value);
@@ -107,7 +135,6 @@
sums[index] = '鍚堣';
return;
}
-
// 鍙闇�瑕佽绠楃殑鍒楄繘琛屾眰鍜�
const needSumColumns = ['sumCount', 'pairCount', 'totalNumber', 'realCount'];
if (needSumColumns.includes(column.property)) {
@@ -195,6 +222,39 @@
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.broke'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/hollowBigStorageGlassDamage', {
+ flowCardId: row.flowCardId,
+ glassType: row.glassType,
+ glassId: row.glassId,
+ layer: row.layer,
+ state: 8,
+ line: 1,
+ workingProcedure: '涓┖',
+ remark: '涓┖'
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const { flowCardId } = row;
+ fetchFlowBind(flowCardId, currentPage2.value);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
+// 缂虹墖璇︽儏-涓�閿牬鎹�
+const handleAllBroke = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('order.dilapidationWhether'),
t('workOrder.prompt'),
{
confirmButtonText: t('workOrder.yes'),
@@ -316,6 +376,35 @@
} catch (error) {
}
};
+// 璀︽姤纭
+const handleSure = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('hellow.clickmakesure'),
+ t('productStock.prompt'),
+ {
+ confirmButtonText: t('productStock.yes'),
+ cancelButtonText: t('productStock.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post('/hollowGlass/productAlarmInfo/updateAlarmInfo', {
+ id: row.id
+ })
+ if (response.code === 200) {
+ showModal.value = false;
+ showAlert.value = false;
+
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
const handlexiang = () => {
dialogFormVisiblea.value = true;
fetchxiang();
@@ -327,10 +416,13 @@
// 鐞嗙墖绗间俊鎭�
const fetchxiang = async () => {
try {
- const response = await request.post('/hollowGlass/hollowBigStorageCage/queryHollowBigStorageCageDetail',{
+ const response = await request.post('/hollowGlass/hollowBigStorageCageDetails/queryVerticalSheetCageDetailsList',{
// deviceId: page,
+ engineerId: engineerId.value,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ glassId: glassId.value,
+ thickness: -1,
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -344,10 +436,13 @@
const fetchxianga = async () => {
let page = window.localStorage.getItem('pagenumber')
try {
- const response = await request.post('/hollowGlass/hollowBigStorageCage/queryHollowBigStorageCageDetail',{
+ const response = await request.post('/hollowGlass/hollowBigStorageCageDetails/queryVerticalSheetCageDetailsList',{
deviceId: page,
+ engineerId: engineerId.value,
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ glassId: glassId.value,
+ thickness: thickness.value ? thickness.value : -1,
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -364,28 +459,28 @@
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
}
// 浠诲姟閲嶇疆
-const handleptask = async() => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('searchOrder.partasks'),
- t('workOrder.prompt'),
- {
- confirmButtonText: t('workOrder.yes'),
- cancelButtonText: t('workOrder.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
- const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.msg);
- }
- }
- } catch (error) {
- }
-};
+// const handleptask = async() => {
+// try {
+// const confirmResult = await ElMessageBox.confirm(
+// t('searchOrder.partasks'),
+// t('workOrder.prompt'),
+// {
+// confirmButtonText: t('workOrder.yes'),
+// cancelButtonText: t('workOrder.cancel'),
+// type: 'warning',
+// }
+// );
+// if (confirmResult === 'confirm') {
+// const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
+// if (response.code === 200) {
+// ElMessage.success(response.message);
+// } else {
+// ElMessage.error(response.msg);
+// }
+// }
+// } catch (error) {
+// }
+// };
// 璋冨害寮�鍏�
const handlediaodu = async () => {
try {
@@ -423,8 +518,38 @@
}
}
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
+ // 鎶ヨ淇℃伅
+if (data.alarmInfo[0] != null && data.alarmInfo[0].length > 0) {
+ const alert = data.alarmInfo[0];
+ const { id, alarmMessage, ...rest } = alert[0];
+ alertMessage.value = `${alarmMessage}`;
+ alertMessage.value = `${alert[0].alarmMessage}`;
+ if (alert[0].alarmCode === 'sizeSame') {
+ alertText.value = t('hellow.sizeSame');
+ } else if (alert[0].alarmCode === 'idSame') {
+ alertText.value = t('hellow.idSame');
+ } else if (alert[0].alarmCode === 'slotLess') {
+ alertText.value = t('hellow.slotLess');
+ } else if (alert[0].alarmCode === 'overSize') {
+ alertText.value = t('hellow.overSize');
+ } else if (alert[0].alarmCode === 'noGlass') {
+ alertText.value = t('hellow.noGlass');
+ } else {
+ alertText.value = t('hellow.unknownAlert');
+ }
+ alarmData.value = data; // 瀛樺偍瀹屾暣鏁版嵁鐢ㄤ簬寮圭獥
+ showAlert.value = true;
+}
+ const formattedData = data.alarmInfo[0].map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ alarmCode: record.alarmCode,
+ alarmMessage: record.alarmMessage
+ }));
+ tableDataAlert.value = formattedData;
+
if(data.lackDetailsList!=null){
const summaries = data.lackDetailsList[0];
const updatedData = summaries.map(summary => ({
@@ -510,42 +635,65 @@
adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCounts.value = data.bigStorageCageInfos[0][1].map(rect => rect.count);
adjustedRectsa.value = data.bigStorageCageInfos[0][2].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCountsa.value = data.bigStorageCageInfos[0][2].map(rect => rect.count);
adjustedRectsb.value = data.bigStorageCageInfos[0][3].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCountsb.value = data.bigStorageCageInfos[0][3].map(rect => rect.count);
adjustedRectsc.value = data.bigStorageCageInfos[0][4].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCountsc.value = data.bigStorageCageInfos[0][4].map(rect => rect.count);
adjustedRectsd.value = data.bigStorageCageInfos[0][5].map((rect, index) => ({
id: index + 1,
height: 15/55,
- top: 33/55,
+ top: 64/55,
}));
subRectsCountsd.value = data.bigStorageCageInfos[0][5].map(rect => rect.count);
+adjustedRectse.value = data.bigStorageCageInfos[0][6].map((rect, index) => ({
+ id: index + 1,
+ height: 15/55,
+ top: 64/55,
+ }));
+subRectsCountse.value = data.bigStorageCageInfos[0][6].map(rect => rect.count);
+
}else{
adjustedRects.value = '',
adjustedRectsa.value = '',
adjustedRectsb.value = '',
- adjustedRectsc.value = ''
- adjustedRectsd.value = ''
+ adjustedRectsc.value = '',
+ adjustedRectsd.value = '',
+ adjustedRectse.value = ''
}
};
-
+const getAlertText = (alarmCode) => {
+ const codeMap = {
+ sizeSame: 'hellow.sizeSame',
+ idSame: 'hellow.idSame',
+ slotLess: 'hellow.slotLess',
+ overSize: 'hellow.overSize',
+ noGlass: 'hellow.noGlass'
+ };
+ return alarmCode in codeMap
+ ? t(codeMap[alarmCode])
+ : t('hellow.unknownAlert');
+};
+// 璀︽姤鍙屽嚮寮圭獥
+const handleDoubleClick = () => {
+ showModal.value = true;
+};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStyle = (rect, index) => ({
position: 'absolute',
@@ -711,6 +859,31 @@
left,
};
};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡鍜屾暟閲�
+const getSubRectse = (rectIndex) => {
+ const count = subRectsCountse.value[rectIndex];
+ const subRects = [];
+ for (let i = 0; i < count; i++) {
+ subRects.push({});
+ }
+ return subRects;
+};
+// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
+const subRectStylee = (rectIndex, subIndex) => {
+ const width = '18px';
+ const marginLeft = '3px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
+ return {
+ position: 'absolute',
+ width,
+ height: '100%',
+ marginLeft,
+ top: '0px',
+ backgroundColor: '#911005',
+ left,
+ };
+};
const iframeUrl = ref('');
const handlehistorical = (row) => {
blindb.value = true;
@@ -724,21 +897,16 @@
closeWebSocket(socket);
}
});
-function getStatusType(enableState: number) {
- switch (enableState) {
- case 100:
- return 'success';
- case 102:
- return 'warning';
- }
-}
-function getStatusText(enableState: number) {
- switch (enableState) {
- case 100:
- return t('searchOrder.zailong');
- case 102:
- return t('searchOrder.rengongxp');
- }
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+function formatTimestamp(timestamp) {
+const date = new Date(timestamp);
+const year = date.getFullYear();
+const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
function getcasOnea(isSame) {
switch (isSame) {
@@ -768,10 +936,53 @@
</script>
<template>
<div style="height: 600px;">
+ <div v-if="showAlert" class="global-alert-bar" @dblclick="handleDoubleClick">
+ <div class="alert-content">
+ <el-icon><WarnTriangleFilled /></el-icon>
+ <span class="alert-text">
+ {{ alertText }} (id:{{ alertMessage }})
+ <span class="confirm-text">{{ $t('hellow.pleaseConfirm') }}</span>
+ </span>
+ </div>
+ <button @click="showAlert = false" class="close-btn">脳</button>
+ </div>
+ <el-dialog
+ v-model="showModal"
+ width="40%"
+ center
+ >
+ <el-table
+ ref="table"
+ border
+ :data="tableDataAlert"
+ max-height="calc(500px - 35px)"
+ style="width: 100%;"
+ >
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="100" />
+ <el-table-column
+ :label="$t('hellow.content')"
+ align="center"
+ min-width="220"
+ >
+ <template #default="scope">
+ <span>
+ {{ getAlertText(scope.row.alarmCode) }}
+ (id:{{ scope.row.alarmMessage }})
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
+ <template #default="scope">
+ <el-button type="text" plain
+ @click="handleSure(scope.row)">{{ $t('basicData.yes') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
<div style="display: flex;">
<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="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
+ <!-- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> -->
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
<div style="display: flex;">
<div style="margin-left: 15px;margin-top: 5px;font-size: 14px;top: 5vh;margin-top: 12px;">{{ $t('searchOrder.hollowPriority') }}锛�</div>
@@ -820,7 +1031,7 @@
>
</div>
</div>
- <div class="img-car4" :style="'z-index:999;left:588px;top:' + 450*carPosition[1] + 'px;position:absolute;'">
+ <div class="img-car4" :style="'z-index:999;left:580px;top:' + 450*carPosition[1] + 'px;position:absolute;'">
<div
v-for="(rect, index) in adjust"
:key="rect.id"
@@ -835,7 +1046,7 @@
</div>
</div>
<div style="position: relative;">
- <div v-show="cell1" style="width: 150px;height: 33px;position: relative;top:292px;left: 418px;">
+ <div v-show="cell1" style="width: 150px;height: 64px;position: relative;top:82px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRects(rectIndex)"
@@ -844,7 +1055,7 @@
></div>
</div>
</div>
- <div v-show="cell2" style="width: 150px;height: 33px;position: relative;top:295px;left: 418px;">
+ <div v-show="cell2" style="width: 150px;height: 64px;position: relative;top:88px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
@@ -853,7 +1064,7 @@
></div>
</div>
</div>
- <div v-show="cell3" style="width: 150px;height: 33px;position: relative;top:298px;left: 418px;">
+ <div v-show="cell3" style="width: 150px;height: 64px;position: relative;top:93px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
@@ -862,7 +1073,7 @@
></div>
</div>
</div>
- <div v-show="cell4" style="width: 150px;height: 33px;position: relative;top:301px;left: 418px;">
+ <div v-show="cell4" style="width: 150px;height: 64px;position: relative;top:99px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
@@ -871,12 +1082,21 @@
></div>
</div>
</div>
- <div v-show="cell5" style="width: 150px;height: 33px;position: relative;top:304px;left: 418px;">
+ <div v-show="cell5" style="width: 150px;height: 64px;position: relative;top:105px;left: 415px;">
<div v-for="(rect, rectIndex) in adjustedRectsd" :key="rect.id" :style="rectStyled(rect, rectIndex)">
<div
v-for="(subRect, subIndex) in getSubRectsd(rectIndex)"
:key="subIndex"
:style="subRectStyled(rectIndex, subIndex)"
+ ></div>
+ </div>
+ </div>
+ <div v-show="cell6" style="width: 150px;height: 64px;position: relative;top:28px;left: 40px;">
+ <div v-for="(rect, rectIndex) in adjustedRectse" :key="rect.id" :style="rectStyled(rect, rectIndex)">
+ <div
+ v-for="(subRect, subIndex) in getSubRectse(rectIndex)"
+ :key="subIndex"
+ :style="subRectStylee(rectIndex, subIndex)"
></div>
</div>
</div>
@@ -891,15 +1111,22 @@
max-height="calc(500px - 35px)"
style="width: 100%;"
>
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
- <el-table-column prop="layer" align="center" :label="$t('reportmanage.layer')" min-width="40" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="139" />
+ <el-table-column prop="layer" align="center" :label="$t('reportmanage.layer')" min-width="38" />
<el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" min-width="80" />
- <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80" />
- <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80" />
- <el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
- <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="52" />
+ <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="62"/>
+ <!-- <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="62" show-overflow-tooltip/> -->
+ <el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="55" />
+ <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="55" />
<el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" />
<el-table-column prop="damageCount" align="center" :label="$t('large.brokenNum')"/>
+ <!-- <el-table-column prop="patchCount" align="center" :label="$t('large.patchCount')"/> -->
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" min-width="82">
+ <template #default="scope">
+ <el-button type="text" plain @click="handleMissingFilms(scope.row)">{{ $t('hellow.missingfilms') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-card>
@@ -1020,66 +1247,19 @@
<!-- 鐞嗙墖绗间俊鎭� -->
<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="engineerId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('processCard.projectnumber')"/>
+ <el-input v-model="glassId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inglassID')"/>
+ <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-input v-model="thickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchxianga">
{{$t('reportmanage.inquire')}}</el-button>
</div>
- <el-table
- :data="tableDataa"
- @row-click="handleRowClick"
- height="700"
- row-key="id"
- default-expand-all
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- >
- <el-table-column type="expand">
- <template #default="props">
- <div v-if="props.row.hollowBigStorageCageDetails && props.row.hollowBigStorageCageDetails.length">
- <el-table
- :data="props.row.hollowBigStorageCageDetails"
- border
- style="width: 98%;margin-left: 20px;"
- row-key="id"
- :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="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
- <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" />
- <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
- <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
- <el-table-column
- align="center"
- :label="$t('searchOrder.startstatus')"
- min-width="80"
- prop="state"
- >
- <template #default="scope">
- <el-tag :type="getStatusType(scope.row.state)">
- {{ getStatusText(scope.row.state) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" min-width="220">
- <template #default="scope">
- <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
- <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="id" :label="$t('searchOrder.cagetableID')" align="center" min-width="100"/>
+ <el-table ref="table" style="margin-top: 20px;height: 700px;width: 1770px;" :data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.cagenumber')" min-width="150" />
- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150" />
+ <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="100" />
+ <el-table-column prop="layer" align="center" :label="$t('processCard.layer')" min-width="80" />
+ <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="120" />
<el-table-column
align="center"
:label="$t('searchOrder.startstatus')"
@@ -1096,45 +1276,44 @@
</template>
</el-table-column>
<el-table-column prop="remainWidth" align="center" :label="$t('searchOrder.remainingwidth')" min-width="120" />
-
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
- <template #default="scope">
- <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button>
- </template>
- </el-table-column>
+ <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="filmsId" align="center" :label="$t('searchOrder.coatingtypes')" 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" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="100" />
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="120" />
+ <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="80" />
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="240">
+ <template #default="scope">
+ <!-- <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.add') }}</el-button> -->
+ <el-button type="text" plain @click="broke(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="brokec(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div>
</div>
</el-dialog>
- <!-- 缂虹墖璇︽儏 -->
- <el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
- <div style="margin-top: -20px;text-align: center;margin-left: 400px;">
- <el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
- {{ currentLack.flowCardId }}
- </el-form-item>
- </div>
- <el-table ref="table" style="margin-top: 20px;height: 400px;" :data="tableDataLack"
+ <!-- 澶氭潯鐮存崯鏁版嵁 -->
+ <el-dialog v-model="dialogFormVisibleb" top="15vh" width="70%" height="500">
+ <el-button plain @click="handleAllBroke">{{ $t('order.dilapidationAll') }}</el-button>
+ <el-table ref="table" style="margin-top: 20px;height: 400px;" :data="tableDataMiss"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" min-width="80" />
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
<el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80" />
- <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80" />
+ <el-table-column prop="workingProcedure" align="center" :label="$t('searchOrder.process')" min-width="80" />
<el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
<el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
- <el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" />
- <el-table-column prop="damageCount" align="center" :label="$t('large.brokenNum')"/>
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
<template #default="scope">
<el-button type="text" plain @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
</template>
- </el-table-column>
- <div style="float: right;margin-bottom: 5px;">
- <el-pagination layout="prev, pager, next" :total="50" />
- </div>
+ </el-table-column>
</el-table>
- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
- <el-pagination background size="large" layout="prev, pager, next" :total="30" :current-page.sync="currentPage2"
- @current-change="handlePageChange2" />
- </div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
@@ -1242,7 +1421,7 @@
.img-zkdlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('/zhongkong.png');
+ background-image:url('/src/assets/zhongkong.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 500px;
@@ -1297,4 +1476,52 @@
.row-red-background {
background-color: #CDAF95 !important;
}
+.global-alert-bar {
+ position: fixed;
+ top: 0;
+ left: 50%; /* 姘村钩灞呬腑鍏抽敭 */
+ transform: translateX(-50%); /* 姘村钩灞呬腑鍏抽敭 */
+ padding: 12px 20px;
+ background-color: #dbdbd7;
+ box-shadow: 0 2px 10px rgba(0,0,0,0.2);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ z-index: 9999;
+ max-width: 80%; /* 闃叉灏忓睆骞曟孩鍑� */
+ min-width: 400px; /* 鏈�灏忓搴︿繚璇� */
+}
+/* 鎻愮ず鍐呭灞呬腑 */
+.alert-content {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-grow: 1; /* 鍗犳嵁鍙敤绌洪棿 */
+}
+/* 鎻愮ず鏂囧瓧鏍峰紡 */
+.alert-text {
+ margin-left: 8px;
+ text-align: center;
+ font-weight: bold;
+ color: #0d0d0d;
+}
+/* 鍏抽棴鎸夐挳鏍峰紡 */
+.close-btn {
+ background: none;
+ border: none;
+ font-size: 1.5rem;
+ cursor: pointer;
+ margin-left: 20px;
+}
+/* 椤甸潰瀹瑰櫒椤堕儴鍐呰竟璺� */
+#app-container {
+ padding-top: 60px; /* 鏍规嵁alert楂樺害璋冩暣 */
+}
+.confirm-text {
+ color: rgb(242, 121, 8);
+ display: block; /* 寮哄埗鎹㈣ */
+ text-align: center; /* 姘村钩灞呬腑 */
+ margin-top: 4px; /* 涓庝笂涓�琛屼繚鎸侀棿璺� */
+ font-weight: 500; /* 鍔犵矖绐佸嚭 */
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0