From 739da1778e71e0fb23cef0a1a2c2a2bc3a7a2cb6 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期二, 15 四月 2025 09:10:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/ApsPartRouteStat/index.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/ApsPartRouteStat/index.vue b/src/views/ApsPartRouteStat/index.vue
index 850b49a..5ac9332 100644
--- a/src/views/ApsPartRouteStat/index.vue
+++ b/src/views/ApsPartRouteStat/index.vue
@@ -26,7 +26,7 @@
</template>
<script setup name="apsPartRouteStat">
-import { query,updateStat } from "@/api/apsPartRouteStat/apsPartRouteStat";
+import { query,updateStat } from "@/api/ApsPartRouteStat/ApsPartRouteStat";
import { ref } from "vue";
import * as XLSX from 'xlsx';
@@ -87,8 +87,9 @@
colList.push({
field: 'dateCol',
title: '鏃ユ湡',
+ fixed: 'left',
children: [
- { field: `resourceName`, title: '璧勬簮缁�', width: 100},
+ { field: `resourceName`, title: '璧勬簮缁�', width: 250, type: 'html'},
],
width: 160
})
@@ -104,9 +105,9 @@
field: `dateColTime${colKey}`,
title: item,
children: [
- { field: `designTimes${colKey}`, title: '璁捐宸ユ椂', width: 100},
- { field: `requireTimes${colKey}`, title: '闇�姹傚伐鏃�', width: 100},
- { field: `capacityLoad${colKey}`, title: '浜ц兘璐熻嵎', width: 100},
+ { field: `designTimes${colKey}`, title: '璁捐宸ユ椂', width: 80},
+ { field: `requireTimes${colKey}`, title: '闇�姹傚伐鏃�', width: 80},
+ { field: `capacityLoad${colKey}`, title: '浜ц兘璐熻嵎', width: 80, type: 'html'},
],
width: 160
})
@@ -131,17 +132,24 @@
}
for (const [key, listValue] of Object.entries(mapItem)) {
data.push(key);
- item[`resourceName`] = key;
+
let tableKey = 0;
+ let flag = false;
listValue.forEach(listItem => {
+
tableKey++
item[`designTimes${tableKey}`] = listItem.designTimes;
item[`requireTimes${tableKey}`] = listItem.requireTimes;
- item[`capacityLoad${tableKey}`] = listItem.capacityLoad;
+ item[`capacityLoad${tableKey}`] = listItem.capacityLoad > 100 ? `<font color="red">${listItem.capacityLoad}%</font>` :listItem.capacityLoad+'%';
data.push(listItem.designTimes);
data.push(listItem.requireTimes);
- data.push(listItem.capacityLoad);
+ data.push(listItem.capacityLoad+'%');
+ if (listItem.capacityLoad > 100) {
+ flag = true;
+ }
});
+
+ item[`resourceName`] = flag ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot"></sup>${key}</div>` : key;
}
exportData.value.push(data);
dataList.push(item);
--
Gitblit v1.9.3