From 9c7185b3a7edd01aaedc2605df20a1c4495b0d3c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 17 四月 2025 17:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/mainPlan/apsPartRoutStat/index.vue | 1 +
src/views/mainPlan/weldSeam/index.vue | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/mainPlan/apsPartRoutStat/index.vue b/src/views/mainPlan/apsPartRoutStat/index.vue
index e3432df..d79ef8f 100644
--- a/src/views/mainPlan/apsPartRoutStat/index.vue
+++ b/src/views/mainPlan/apsPartRoutStat/index.vue
@@ -40,6 +40,7 @@
const gridOptions = reactive({
border: true,
+ stripe: true,
loading: false,
showOverflow: true,
showHeaderOverflow: true,
diff --git a/src/views/mainPlan/weldSeam/index.vue b/src/views/mainPlan/weldSeam/index.vue
index cdec401..51cf689 100644
--- a/src/views/mainPlan/weldSeam/index.vue
+++ b/src/views/mainPlan/weldSeam/index.vue
@@ -226,7 +226,8 @@
title: '鐢熶骇鍩哄湴',
field: 'productionBase',
width: 150,
- fixed: 'left'
+ fixed: 'left',
+ type: 'html'
},
{
title: '璁㈠崟闇�姹�',
@@ -275,6 +276,7 @@
title: '鏄惁婊¤冻',
field: 'isSatisfy',
width: 150,
+ type: 'html'
},
{ title: '鎿嶄綔', width: 100, fixed:"right", slots: { default: 'buttons' } }
]);
@@ -452,9 +454,9 @@
function getList() {
loading.value = true;
query(queryParams.value).then(response => {
- dataList.value = response.rows;
+ let responseData = response.rows;
// exportData.value = response.rows;
- dataList.value.forEach(item=>{
+ responseData.forEach(item=>{
let data = [];
data.push(item.year);
data.push(item.month);
@@ -469,8 +471,12 @@
data.push(item.requirementDayWeldSeam);
data.push(item.productionDayWeldSeam);
data.push(item.isSatisfy);
+
+ item.productionBase = item.isSatisfy === '鍚�' ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot" style="right: 2px; top: 2px;"></sup>${item.productionBase}</div>` : item.productionBase
+ item.isSatisfy = item.isSatisfy === '鍚�' ? `<font color='red'>${item.isSatisfy}</font>` : item.isSatisfy
exportData.value.push(data);
})
+ dataList.value = responseData;
loading.value = false;
});
}
--
Gitblit v1.9.3