|
@@ -25,8 +25,16 @@
|
|
|
</template>
|
|
|
<template #suffix>
|
|
|
<n-space>
|
|
|
- <EditClass :task="task" :taskClass="item" :getClassList="getClassList" />
|
|
|
- <DeleteClass :task="task" :taskClass="item" :getClassList="getClassList" />
|
|
|
+ <EditClass
|
|
|
+ :task="task"
|
|
|
+ :taskClass="item"
|
|
|
+ :getClassList="getClassList"
|
|
|
+ />
|
|
|
+ <DeleteClass
|
|
|
+ :task="task"
|
|
|
+ :taskClass="item"
|
|
|
+ :getClassList="getClassList"
|
|
|
+ />
|
|
|
</n-space>
|
|
|
</template>
|
|
|
<n-thing>
|
|
@@ -238,14 +246,12 @@ const handleCheckAll = (checked) => {
|
|
|
checkValues.value.forEach(async (item) => {
|
|
|
queryData.T_id = item;
|
|
|
await getDataList();
|
|
|
- const data1 = dataList.value.map((item) => [
|
|
|
- new Date(item.T_time).getTime(),
|
|
|
- item.T_t,
|
|
|
- ]);
|
|
|
- const data2 = dataList.value.map((item) => [
|
|
|
- new Date(item.T_time).getTime(),
|
|
|
- item.T_rh,
|
|
|
- ]);
|
|
|
+ const data1 = dataList.value
|
|
|
+ .map((item) => [new Date(item.T_time).getTime(), item.T_t])
|
|
|
+ .sort((a, b) => a[0] - b[0]);
|
|
|
+ const data2 = dataList.value
|
|
|
+ .map((item) => [new Date(item.T_time).getTime(), item.T_rh])
|
|
|
+ .sort((a, b) => a[0] - b[0]);
|
|
|
chart1.value.chart.addSeries({
|
|
|
id: item,
|
|
|
name: item,
|
|
@@ -300,14 +306,12 @@ const onUpdateValues = async (values, meta) => {
|
|
|
queryData.T_id = classInfo.T_id;
|
|
|
queryData.T_sn = classInfo.T_sn;
|
|
|
await getDataList();
|
|
|
- const data1 = dataList.value.map((item) => [
|
|
|
- new Date(item.T_time).getTime(),
|
|
|
- item.T_t,
|
|
|
- ]);
|
|
|
- const data2 = dataList.value.map((item) => [
|
|
|
- new Date(item.T_time).getTime(),
|
|
|
- item.T_rh,
|
|
|
- ]);
|
|
|
+ const data1 = dataList.value
|
|
|
+ .map((item) => [new Date(item.T_time).getTime(), item.T_t])
|
|
|
+ .sort((a, b) => a[0] - b[0]);
|
|
|
+ const data2 = dataList.value
|
|
|
+ .map((item) => [new Date(item.T_time).getTime(), item.T_rh])
|
|
|
+ .sort((a, b) => a[0] - b[0]);
|
|
|
if (meta.actionType === "check") {
|
|
|
chart1.value.chart.addSeries({
|
|
|
id: meta.value,
|
|
@@ -486,6 +490,7 @@ const getDataList = async () => {
|
|
|
}
|
|
|
}
|
|
|
const { data: res } = await getTaskDataList(data);
|
|
|
+ console.log(res);
|
|
|
dataList.value = res.Data.List || [];
|
|
|
if (queryData.page_z <= res.Data.Page_size) {
|
|
|
const arr = classList.value.filter((item) =>
|