From cfbbc59a0e7cda7c08c6b67a407eebf3e81f4491 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 30 Jul 2025 16:31:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.196.74.78:10010/r/drone/drone-web-manage into dev
---
src/views/tickets/orderLog.vue | 4 ++++
src/api/home/index.js | 15 ++++++---------
src/views/wel/components/backlog.vue | 12 +++++++-----
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/api/home/index.js b/src/api/home/index.js
index c5c1d1a..3b7e45f 100644
--- a/src/api/home/index.js
+++ b/src/api/home/index.js
@@ -96,17 +96,14 @@
});
};
// 获取事件工单或者智飞工单的信息
-export const getOrderOrEventApi = (type,areaCode) => {
+
+export const getOrderOrEventApi = data => {
return request({
url: '/drone-device-core/jobEvent/getOrderOrEvent',
- method: 'get',
- params: {
- type,
- areaCode
- },
- });
-};
-
+ method: 'post',
+ data: data,
+ })
+}
// 任务成果
export const getdisposeApi = data => {
return request({
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 21d4fc4..9dddfcb 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -1241,6 +1241,8 @@
this.$message.success('审核通过')
this.detailVisibleCopy = false
+ this.detailVisible = false
+
this.page.currentPage = 1
this.onLoad(this.page, this.query)
// this.handleViewDetail()
@@ -1258,6 +1260,8 @@
this.$message.success('驳回成功')
this.detailVisibleCopy = false
+ // this.detailVisible = false
+
this.page.currentPage = 1
this.onLoad(this.page, this.query)
})
diff --git a/src/views/wel/components/backlog.vue b/src/views/wel/components/backlog.vue
index b59c5cf..8213936 100644
--- a/src/views/wel/components/backlog.vue
+++ b/src/views/wel/components/backlog.vue
@@ -49,7 +49,7 @@
</template>
<script setup>
-import st7 from '@/assets/images/workbench/st7.svg'
+
import db1 from '@/assets/images/workbench/db1.svg'
import db2 from '@/assets/images/workbench/db2.svg'
import db3 from '@/assets/images/workbench/db3.svg'
@@ -59,8 +59,7 @@
import { onMounted } from 'vue'
import { useRouter } from 'vue-router'
import { useStore } from 'vuex'
-const zfTotal = ref(0)
-const sjTotal = ref(0)
+
const router = useRouter()
const store = useStore()
const permission = computed(() => store.getters.permission)
@@ -216,9 +215,12 @@
if (todosCache[checked.value].length > 0) {
todos.value = todosCache[checked.value]
}
-
+ const todosParams = {
+ type:type,
+ area_code: userInfo.value.detail.areaCode,
+ }
try {
- const res = await getOrderOrEventApi(type, userInfo.value.detail.areaCode)
+ const res = await getOrderOrEventApi(todosParams)
const data = res.data.data || []
todos.value = data
todosCache[checked.value] = data
--
Gitblit v1.9.3