From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/views/wel/components/backlog.vue | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/src/views/wel/components/backlog.vue b/src/views/wel/components/backlog.vue
index 615d268..b335f6f 100644
--- a/src/views/wel/components/backlog.vue
+++ b/src/views/wel/components/backlog.vue
@@ -3,7 +3,7 @@
<div class="block">
<div class="title">待办事项</div>
- <div class="todo-items">
+ <div class="todo-items" v-if="todos.length>0">
<div
v-for="(item, index) in todos"
:key="index"
@@ -33,13 +33,19 @@
</div>
</div>
</div>
+ <div v-else>
+ <el-empty >
+ <template #description>
+ <span class="custom-text">暂无数据</span>
+ </template>
+ </el-empty>
+ </div>
</div>
</div>
</template>
<script setup>
import st7 from '@/assets/images/workbench/st7.png';
-
import { getdaiban } from '@/api/home/index';
import { onMounted } from 'vue';
import { useRouter } from 'vue-router';
@@ -47,8 +53,9 @@
const router = useRouter();
const store = useStore();
const permission = computed(() => store.getters.permission);
+const userInfo = computed(() => store.getters.userInfo);
const todos = ref([]);
-
+const loading = ref(false);
const statusMap = {
0: '待处理',
2: '待审核',
@@ -95,34 +102,54 @@
}
};
const getListMatter = async () => {
- console.log('permission.value.o_and_m_p_jump', permission.value.o_and_m_p_jump);
-
- if (permission.value.o_and_m_p_jump === true) {
- const res = await getdaiban(0);
- todos.value = res.data.data?.slice(0, 5);
- } else {
- const res = await getdaiban(1);
- todos.value = res.data.data?.slice(0, 5);
+ loading.value = true;
+ try {
+ if (permission.value.o_and_m_p_jump === true) {
+ const res = await getdaiban(0, userInfo.value.detail.areaCode);
+ todos.value = res.data.data?.slice(0, 5) || [];
+ loading.value = false;
+ } else {
+ const res = await getdaiban(1, userInfo.value.detail.areaCode);
+ todos.value = res.data.data?.slice(0, 5) || [];
+ loading.value = false;
+ }
+ } catch (error) {}
+};
+const isDataReady = computed(() => {
+ return userInfo.value.detail?.areaCode && permission.value.o_and_m_p_jump;
+});
+const autoFetchData = () => {
+ if (isDataReady.value) {
+ getListMatter();
}
};
+watch(
+ () => [userInfo.value.detail?.areaCode, permission.value.o_and_m_p_jump],
+ () => autoFetchData(),
+ { immediate: true }
+);
+
const jumporder = val => {
if (permission.value.o_and_m_p_jump === true) {
const id = val.id;
router.push({
- path: `/tickets/orderLog?id=${id}`,
+ path: `/tickets/orderLog`,
query: {
- id: id,
+ id,
},
});
} else {
const orderNumber = val.event_num;
router.push({
- path: `/tickets/ticket?orderNumber=${orderNumber}`,
+ path: `/tickets/ticket`,
+ query: {
+ orderNumber,
+ },
});
}
};
onMounted(() => {
- getListMatter();
+ autoFetchData();
});
</script>
@@ -137,6 +164,7 @@
.block {
margin: 11px 21px 13px 22px;
.title {
+ font-family: 'Source Han Sans CN';
font-weight: bold;
font-size: 16px;
color: #363636;
@@ -236,5 +264,9 @@
}
}
}
+ .custom-text {
+ font-size: 14px;
+color: #7C8091;
+ }
}
</style>
--
Gitblit v1.9.3