From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/wel/components/backlog.vue | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/src/views/wel/components/backlog.vue b/src/views/wel/components/backlog.vue
index 9c52e74..a9b14bd 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)
@@ -111,16 +110,7 @@
2: { color: '#4200DD', backgroundImage: db5, borderLeftColor: '#4200DD' },
3: { color: '#FF472F', backgroundImage: db2, borderLeftColor: '#FF472F' },
}
-// 根据状态获取图标
-// const getStatusBackground = statusIndex => {
-// if (checked.value === '智飞工单') {
-// const style = zfstatusMapColor[statusIndex];
-// return style ? `url(${style.backgroundImage})` : 'none';
-// } else {
-// const style = statusMapColor[statusIndex];
-// return style ? `url(${style.backgroundImage})` : 'none';
-// }
-// };
+
const getStatus = statusIndex => {
if (checked.value === '智飞工单') {
const style = zfstatusMapColor[statusIndex]
@@ -164,7 +154,7 @@
if (checked.value === '智飞工单') {
const id = val.id
getaddOrderRecord(id)
- router.push({
+ router.replace({
path: `/tickets/orderLog`,
query: {
id,
@@ -173,12 +163,10 @@
} else {
getaddOrderRecord(val.id)
const orderNumber = val.event_num
- router.push({
- path: `/tickets/ticket`,
- query: {
- orderNumber,
- },
- })
+ router.replace({
+ path: `/tickets/ticket`,
+ query: { orderNumber },
+})
}
}
// 标记事件工单或智飞工单已读
@@ -216,12 +204,15 @@
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
+ todos.value = data.sort((a, b) => a.is_read - b.is_read)
+ todosCache[checked.value] = todos.value
} finally {
loading.value = false
}
@@ -240,7 +231,7 @@
.bocklogBox {
width: 100%;
// height: 306px;
- height: pxToVh(326);
+ height: pxToVh(316);
background: rgba(255, 255, 255, 0.41);
box-shadow: 0px 3px 4px -1px rgba(125, 125, 125, 0.25);
border-radius: 8px 8px 8px 8px;
--
Gitblit v1.9.3