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 | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 0aa54a0..f7eb58b 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -34,7 +34,7 @@
const alertMessage = ref('')
const alarmData = ref<any>(null)
const showModal = ref(false)
-const currentAlarm = ref<any>(null);
+const currentAlarm = ref<any>(null)
const tableDataAlert = ref([])
const alertText = ref('')
@@ -613,8 +613,8 @@
? t(codeMap[alarmCode])
: t('hellow.unknownAlert');
};
+// 璀︽姤鍙屽嚮寮圭獥
const handleDoubleClick = () => {
- // currentAlarm.value = alarmData.value?.alarmInfo?.[0]?.[0] || null;
showModal.value = true;
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
@@ -1018,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>
--
Gitblit v1.8.0