From 3a60ee203ba55ff9df9bcc81b465cfaeb5faf05b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 23 九月 2025 15:08:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowslicecage.vue | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 173 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 6dded87..f7eb58b 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -29,6 +29,15 @@
const carPosition = ref([])
const tableDatass = ref([])
const tableDataLack = 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 ganghua = ref('')
const diaodu = ref('')
const hollowPriority = ref('')
@@ -316,6 +325,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();
@@ -425,6 +463,27 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/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}`;
+ // 鍔ㄦ�佺炕璇戦�昏緫锛氭牴鎹產larmCode閫夋嫨缈昏瘧閿�
+ alertText.value = alert[0].alarmCode === 'sizeSame'
+ ? t('hellow.sizeSame')
+ : t('hellow.idSame');
+ 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 => ({
@@ -545,7 +604,19 @@
adjustedRectsd.value = ''
}
};
-
+const getAlertText = (alarmCode) => {
+ const codeMap = {
+ sizeSame: 'hellow.sizeSame',
+ idSame: 'hellow.idSame'
+ };
+ return alarmCode in codeMap
+ ? t(codeMap[alarmCode])
+ : t('hellow.unknownAlert');
+};
+// 璀︽姤鍙屽嚮寮圭獥
+const handleDoubleClick = () => {
+ showModal.value = true;
+};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStyle = (rect, index) => ({
position: 'absolute',
@@ -724,6 +795,17 @@
closeWebSocket(socket);
}
});
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+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 getStatusType(enableState: number) {
switch (enableState) {
case 100:
@@ -768,6 +850,48 @@
</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>
+ </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>
@@ -894,12 +1018,17 @@
<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="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="thickness" align="center" :label="$t('hellow.thickness')" min-width="70" />
+ <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="70" />
<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>
</el-table>
</div>
</el-card>
@@ -1297,4 +1426,45 @@
.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楂樺害璋冩暣 */
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0