计划执行任务分页查询

src/api/modules/task/plan.js

@@ -0,0 +1,13 @@
+import {httpApi} from "../../request/httpApi";
+
+export default {
+    //计划任务执行分页查询
+    async getPage(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/approve/task/plan/page',
+            method: 'post',
+            data: form
+        }, msg);
+    },
+ 
+}

src/views/project/list/index.vue

@@ -81,7 +81,6 @@ import {delMessage} from "~uti/tools";
 
 const router = useRouter()
 onMounted(()=>{
-    getTableData()
     getProjectType()
     getProjectServerTypeDict()
 })

src/views/task/plan/components/TaskTable.vue

@@ -37,7 +37,7 @@
             </div>
         </template>
         <template #extra>
-            <el-button size="large" :type="isTableKey === 'user'?'primary':'info'" :disabled="isTableKey !== 'user'" hc-btn @click="showChangeState">
+            <el-button size="large" :type="isTableKey === 1?'primary':'info'" :disabled="isTableKey !== 1" hc-btn @click="showChangeState">
                 <HcIcon name="edit-circle"/>
                 <span>变更状态</span>
             </el-button>
@@ -92,17 +92,22 @@
 </template>
 
 <script setup>
-import {ref, nextTick, watch} from "vue";
+import {ref, nextTick, watch,onMounted,onActivated} from "vue";
 import {useRouter} from 'vue-router'
 import {getArrValue} from "js-fast-way"
+import planApi from '~api/task/plan.js';
 
 const router = useRouter()
+onActivated(()=>{
+    getTableData()
+   
+})
 
 //参数
 const props = defineProps({
     tableKey: {
-        type: String,
-        default: ''
+        type: Number,
+        default: 1
     }
 })
 
@@ -113,12 +118,16 @@ const isTableKey = ref(props.tableKey);
 watch(() => [
     props.tableKey,
 ], ([Key]) => {
+    console.log(Key,'key');
     isTableKey.value = Key
+    searchForm.value.selectType=Key
+    getTableData()
+   
 })
 
 //搜索表单
 const searchForm = ref({
-    department: null, state: null, startTime: null, endTime: null,
+    deptId: null, selectType:isTableKey.value, planStartTime: null, planEndTime: null,taskStatus:null,
     current: 1, size: 20, total: 0
 })
 
@@ -131,7 +140,7 @@ const searchClick = () => {
 //重置
 const resetClick = () => {
     searchForm.value = {
-        department: null, state: null, startTime: null, endTime: null,
+        deptId: null, selectType:isTableKey.value, planStartTime: null, planEndTime: null,taskStatus:null,
         current: 1, size: 20, total: 0
     }
 }
@@ -146,20 +155,30 @@ const pageChange = ({current, size}) => {
 //获取数据
 const tableLoading = ref(false)
 const tableColumn = ref([
-    {key: 'name', name: '任务所属项目'},
-    {key: 'key', name: '状态', width: '120', align: 'center'},
-    {key: 'key1', name: '任务描述'},
-    {key: 'key2', name: '完成指标'},
-    {key: 'key3', name: '计划起止日期', width: '220', align: 'center'},
-    {key: 'key4', name: '任务人', width: '120', align: 'center'},
+    {key: 'projectName', name: '任务所属项目'},
+    {key: 'statusName', name: '状态', width: '120', align: 'center'},
+    {key: 'taskDesc', name: '任务描述'},
+    {key: 'planTarget', name: '完成指标'},
+    {key: 'startAndEndDate', name: '计划起止日期', width: '220', align: 'center'},
+    {key: 'taskUserName', name: '任务人', width: '120', align: 'center'},
 ])
 const tableData = ref([
     {id: 1, name: 'xxxxx', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
     {id: 2, name: 'xxxxx', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
     {id: 3, name: 'xxxxx', key: '未完成', key1: 'xxxxxxxxxx', key2: 'xxxxxxxx', key3: '2022-02-01', key4: '张三'},
 ])
-const getTableData = () => {
+const getTableData = async() => {
     //const key = isTableKey.value
+    tableLoading.value = true
+    const {error, code, data} = await planApi.getPage(searchForm.value)
+    tableLoading.value = false
+    if (!error && code === 200) {
+        tableData.value = getArrValue(data['records'])
+        searchForm.value.total = data['total'] || 0
+    } else {
+        tableData.value = []
+        searchForm.value.total = 0
+    }
 }
 
 //表格选择

src/views/task/plan/index.vue

@@ -1,9 +1,9 @@
 <template>
     <HcTabsSimple :cur="tabsKey" :datas="tabsData" @tabClick="tabsClick">
-        <template #tab-user>
+        <template #tab-1>
             <TaskTable :tableKey="tabsKey"/>
         </template>
-        <template #tab-all>
+        <template #tab-2>
             <TaskTable :tableKey="tabsKey"/>
         </template>
     </HcTabsSimple>
@@ -14,10 +14,10 @@ import {ref, watch} from "vue";
 import TaskTable from "./components/TaskTable.vue";
 
 //选项卡
-const tabsKey = ref('user')
+const tabsKey = ref(1)
 const tabsData = ref([
-    {icon: 'user', label: '我的计划任务', key: 'user'},
-    {icon: 'todo', label: '查看全部计划任务', key: 'all'},
+    {icon: 'user', label: '我的计划任务', key: 1},
+    {icon: 'todo', label: '查看全部计划任务', key: 2},
 ])
 
 const tabsClick = (key) => {