From b0ccd2d131b2e3df5d901385e38ed0077b8d0fbc Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 14 Apr 2025 12:31:31 +0800
Subject: [PATCH] feat:修改任务管理内容
---
src/views/TaskManage/TaskTop/TaskTime.vue | 17 +++++++-
src/views/TaskManage/TaskTop/TaskEvent.vue | 20 ++++++++--
src/views/TaskManage/SearchBox.vue | 11 ++++-
src/views/TaskManage/TaskTop/TaskIndustry.vue | 20 +++++++--
src/store/modules/task.js | 5 +-
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 5 +-
6 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/src/store/modules/task.js b/src/store/modules/task.js
index dbd811e..805367f 100644
--- a/src/store/modules/task.js
+++ b/src/store/modules/task.js
@@ -3,12 +3,13 @@
const task = {
state: {
// 用于任务管理搜索条件
- taskSearchParams:getStore({ name: 'taskSearchParams' }) || {},
+ taskSearchParams: {},
},
actions: {},
mutations: {
setTaskSearchParams: (state, data) => {
- setStore({ name: 'taskSearchParams', content: data })
+ console.log(data)
+ // setStore({ name: 'taskSearchParams', content: data })
state.taskSearchParams = data;
},
},
diff --git a/src/views/TaskManage/SearchBox.vue b/src/views/TaskManage/SearchBox.vue
index 19af07f..a68978c 100644
--- a/src/views/TaskManage/SearchBox.vue
+++ b/src/views/TaskManage/SearchBox.vue
@@ -71,7 +71,9 @@
import { deptsByAreaCode, getDockInfo } from '@/api/home/common';
import TaskAlgorithmBusiness from './components/TaskAlgorithmBusiness.vue';
import dayjs from 'dayjs';
+import { useStore } from 'vuex'
+const store = useStore()
const isExpand = ref(false);
const toggleExpand = () => {
isExpand.value = !isExpand.value;
@@ -102,11 +104,14 @@
const emit = defineEmits(['search','addTask']);
const handleSearch = () => {
- emit('search', {
+ // 提交至store
+ let params = {
...searchForm,
start_date: dateRange.value.length ? `${dateRange.value[0]} 00:00:00` : null,
end_date: dateRange.value.length ? `${dateRange.value[1]} 23:59:59` : null
- });
+ }
+ store.commit('setTaskSearchParams', params);
+ emit('search', params);
};
const handleReset = () => {
@@ -187,7 +192,7 @@
checked.value = item;
// model.value = dateRanges[item];
// emit('change', dateRanges[item],timeListEnum[index]);
- searchForm.value.date_enum = timeListEnum[index];
+ searchForm.date_enum = timeListEnum[index];
};
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 2ea617b..104e7af 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -70,7 +70,7 @@
const jobListParams = reactive({
current: 1,
- size: 8,
+ size: 10,
searchParams:{}
});
const jobListData = ref([]);
@@ -121,8 +121,6 @@
jobListParams.current = 1;
jobListParams.size = 10;
jobListParams.searchParams = params;
- // 存储查询条件 ，用于统计图搜索
-
getJobList();
};
@@ -154,6 +152,7 @@
.task-table {
height: 528px;
margin-top: 18px;
+ overflow: auto;
}
.current-details {
diff --git a/src/views/TaskManage/TaskTop/TaskEvent.vue b/src/views/TaskManage/TaskTop/TaskEvent.vue
index acc2dc5..8f64a96 100644
--- a/src/views/TaskManage/TaskTop/TaskEvent.vue
+++ b/src/views/TaskManage/TaskTop/TaskEvent.vue
@@ -10,7 +10,12 @@
import * as echarts from 'echarts';
import { jobEventBar } from '@/api/home/task';
import dayjs from 'dayjs';
-import useEchartsResize from '@/hooks/useEchartsResize'
+import useEchartsResize from '@/hooks/useEchartsResize';
+import { useStore } from 'vuex';
+
+const store = useStore();
+
+// const setTaskSearchParams = computed(() => store.state.task.setTaskSearchParams);
// 日期
const currenDate = dayjs().format('YYYY-MM-DD');
@@ -100,8 +105,8 @@
};
// 获取行业统计数据
-const getJobEventBar = (value,date_enum) => {
- jobEventBar({date_enum}).then(res => {
+const getJobEventBar = (value) => {
+ jobEventBar(value).then(res => {
if (res.data.code !== 0) return;
option.xAxis.data = res.data.data.map(item => item.name);
option.series[0].data = res.data?.data.map(item => item.data[0].value);
@@ -110,9 +115,16 @@
});
};
+// 添加监听
+watch(() => store.state.task.taskSearchParams, (newVal) => {
+ console.log(newVal, '1111');
+ if (newVal) {
+ getJobEventBar(newVal);
+ }
+}, { deep: true });
onMounted(() => {
- getJobEventBar(newTime.value, 'CURRENT_YEAR');
+ getJobEventBar({date_enum: 'TODAY'});
});
</script>
diff --git a/src/views/TaskManage/TaskTop/TaskIndustry.vue b/src/views/TaskManage/TaskTop/TaskIndustry.vue
index 303095f..81de854 100644
--- a/src/views/TaskManage/TaskTop/TaskIndustry.vue
+++ b/src/views/TaskManage/TaskTop/TaskIndustry.vue
@@ -9,9 +9,12 @@
<script setup>
import * as echarts from 'echarts';
import { industryJobNumPieChart } from '@/api/home/task';
-import useEchartsResize from '@/hooks/useEchartsResize'
+import useEchartsResize from '@/hooks/useEchartsResize';
+import { useStore } from 'vuex';
+
+const store = useStore();
const chartRef = ref(null);
-let { chart } = useEchartsResize(chartRef)
+let { chart } = useEchartsResize(chartRef);
const option = {
tooltip: {
@@ -65,8 +68,8 @@
};
// 获取行业统计数据
-const getIndustryJobNumPieChart = () => {
- industryJobNumPieChart().then(res => {
+const getIndustryJobNumPieChart = (value) => {
+ industryJobNumPieChart(value).then(res => {
if (res.data.code !== 0) return;
option.series[0].data.forEach(item => {
const matchData = res.data.data.find(d => d.name === item.name);
@@ -95,9 +98,16 @@
// });
// };
+// 添加监听
+watch(() => store.state.task.taskSearchParams, (newVal) => {
+ console.log(newVal, '2222');
+ if (newVal) {
+ getIndustryJobNumPieChart(newVal);
+ }
+}, { deep: true });
onMounted(() => {
- getIndustryJobNumPieChart();
+ getIndustryJobNumPieChart({date_enum: 'TODAY'});
});
</script>
diff --git a/src/views/TaskManage/TaskTop/TaskTime.vue b/src/views/TaskManage/TaskTop/TaskTime.vue
index c136bbb..d4a7c31 100644
--- a/src/views/TaskManage/TaskTop/TaskTime.vue
+++ b/src/views/TaskManage/TaskTop/TaskTime.vue
@@ -11,6 +11,9 @@
import { jobNumBar } from '@/api/home/task';
import dayjs from 'dayjs';
import useEchartsResize from '@/hooks/useEchartsResize'
+import { useStore } from 'vuex';
+
+const store = useStore();
// 日期
const currenDate = dayjs().format('YYYY-MM-DD');
@@ -93,8 +96,8 @@
};
// 获取任务时间统计数据
-const getJobNumBar = (value,date_enum) => {
- jobNumBar({date_enum}).then(res => {
+const getJobNumBar = (value) => {
+ jobNumBar(value).then(res => {
if (res.data.code !== 0) return;
option.xAxis.data = res.data.data.map(item => item.name);
option.series[0].data = res.data.data.map(item => item.value);
@@ -102,9 +105,17 @@
});
};
+// 添加监听
+watch(() => store.state.task.taskSearchParams, (newVal) => {
+ console.log(newVal, '33333');
+ if (newVal) {
+ getJobNumBar(newVal);
+ (newVal);
+ }
+}, { deep: true });
onMounted(() => {
- getJobNumBar(newTime.value, 'CURRENT_YEAR');
+ getJobNumBar({date_enum: 'TODAY'});
});
</script>
--
Gitblit v1.9.3