实时表历史表联查显示表数据

ruoyi-ui/src/api/job/mydoJob.js

@@ -18,6 +18,14 @@ export function listMydoJobFinish(query) {
   })
 }
 
+export function listMydoJobUnion(query) {
+  return request({
+    url: '/job/mydoJob/listUnion',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询作业信息详细
 export function getMydoJob(jobId) {
   return request({

ruoyi-ui/src/views/job/mydoJob/index.vue

@@ -217,7 +217,7 @@
 </template>
 
 <script>
-import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish, handFinish, resendTaskToEntrance } from "@/api/job/mydoJob"
+import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish,listMydoJobUnion, handFinish, resendTaskToEntrance } from "@/api/job/mydoJob"
 
 export default {
   name: "MydoJob",
@@ -284,19 +284,27 @@ export default {
     /** 查询作业信息列表 */
     getList() {
       this.loading = true
-      if (this.queryParams.status === '4' || this.queryParams.status === '5') {
-        listMydoJobFinish(this.queryParams).then(response => {
+      
+      listMydoJobFinish(this.queryParams).then(response => {
           this.mydoJobList = response.rows
           this.total = response.total
           this.loading = false
         })
-      } else {
-        listMydoJob(this.queryParams).then(response => {
-          this.mydoJobList = response.rows
-          this.total = response.total
-          this.loading = false
-        })
-      }
+
+      // if (this.queryParams.status === '4' || this.queryParams.status === '5' 
+      // || this.queryParams.status === '6') {
+      //   listMydoJobFinish(this.queryParams).then(response => {
+      //     this.mydoJobList = response.rows
+      //     this.total = response.total
+      //     this.loading = false
+      //   })
+      // } else {
+      //   listMydoJob(this.queryParams).then(response => {
+      //     this.mydoJobList = response.rows
+      //     this.total = response.total
+      //     this.loading = false
+      //   })
+      // }
 
     },
     // 取消按钮