From 0082fa417fb2af9add3406bf05ab3e3e45890c34 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 12 Jun 2025 14:30:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/wel/components/backlog.vue | 255 +++++++++++++++++++++++++++++---------------------
1 files changed, 146 insertions(+), 109 deletions(-)
diff --git a/src/views/wel/components/backlog.vue b/src/views/wel/components/backlog.vue
index 06dbf80..926994b 100644
--- a/src/views/wel/components/backlog.vue
+++ b/src/views/wel/components/backlog.vue
@@ -6,14 +6,15 @@
<div class="rightTab">
<div
class="titleItem"
- :class="item === checked ? 'activeItem' : ''"
+ :class="item.name === checked ? 'activeItem' : ''"
v-for="(item, index) in titleList"
:key="index"
@click="titleClick(item, index)"
>
<div>
- {{ item }}
- <div class="dots">{{checked==0?sjTotal: zfTotal}}</div>
+ {{ item.name }}
+ <div class="dots" :class="item.number >= 100 ? 'dots1':''">{{ item.number >= 100 ? '99+' : item.number }}</div>
+ <!-- <div class="dots">99+</div> -->
</div>
</div>
</div>
@@ -28,18 +29,15 @@
@click="jumporder(item)"
>
<div
- class="status-indicator"
- :style="{ backgroundImage: getStatusBackground(item.status) }"
- ></div>
+ class="status-indicator"
+ ><img :src="getStatus(item.status)" alt=""></div>
<div class="content-wrapper">
<div class="main-content">
<span class="status-tag" :style="{ color: getStatusColor(item.status) }">{{
- permission.o_and_m_p_jump === true
- ? zfstatusMap[item.status]
- : statusMap[item.status]
+ checked == '智飞工单' ? zfstatusMap[item.status] : statusMap[item.status]
}}</span>
- <span class="unread"></span>
+ <span class="reads" :class="item.is_read === 0 ? 'unread' : ''"></span>
<span class="todo-text">{{ item.name }}</span>
</div>
@@ -62,31 +60,44 @@
</template>
<script setup>
-import st7 from '@/assets/images/workbench/st7.png';
-import db1 from '@/assets/images/workbench/db1.png';
-import db2 from '@/assets/images/workbench/db2.png';
-import db3 from '@/assets/images/workbench/db3.png';
-import db4 from '@/assets/images/workbench/db4.png';
-import db5 from '@/assets/images/workbench/db5.png';
-import { getdaiban } from '@/api/home/index';
+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';
+import db4 from '@/assets/images/workbench/db4.svg';
+import db5 from '@/assets/images/workbench/db5.svg';
+import { getOrderCountApi, addOrderRecordApi, getOrderOrEventApi } from '@/api/home/index';
import { onMounted } from 'vue';
import { useRouter } from 'vue-router';
import { useStore } from 'vuex';
-const zfTotal = ref(0)
-const sjTotal = ref(0)
+const zfTotal = ref(0);
+const sjTotal = ref(0);
const router = useRouter();
const store = useStore();
const permission = computed(() => store.getters.permission);
-// console.log('uuuuu', permission.value);
const checked = ref('事件工单');
-const titleList = ref(['事件工单', '智飞工单']);
+const titleList = ref([
+ {
+ label: 'event_order_count',
+ name: '事件工单',
+ number: 0,
+ },
+ {
+ label: 'wayline_order_count',
+ name: '智飞工单',
+ number: 0,
+ },
+]);
const titleClick = (item, index) => {
- checked.value = item;
+ checked.value = item.name;
+ getListMatter();
};
const userInfo = computed(() => store.getters.userInfo);
const todos = ref([]);
const loading = ref(false);
+// * 事件工单中2=待审核,0=待处理,3=处理中
+// * 智飞工单中1: 待审核,2=已驳回,3=已通过
const statusMap = {
0: '待处理',
2: '待审核',
@@ -99,30 +110,35 @@
};
const zfstatusMap = {
1: '待审核',
+ 2: '已驳回',
+ 3: '已通过',
};
const zfstatusMapColor = {
1: { color: '#FF472F', backgroundImage: db2, borderLeftColor: '#FF472F' },
+ 2: { color: '#4200DD', backgroundImage: db5, borderLeftColor: '#4200DD' },
+ 3: { color: '#FF472F', backgroundImage: db2, borderLeftColor: '#FF472F' },
};
// 根据状态获取图标
-const getStatusBackground = statusIndex => {
- if (
- (permission.value.device_statistics_six === true &&
- permission.value.device_statistics_four === true) ||
- permission.value.device_statistics_six === true
- ) {
+// 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];
- return style ? `url(${style.backgroundImage})` : 'none';
+ return style ? style.backgroundImage : '';
} else {
const style = statusMapColor[statusIndex];
- return style ? `url(${style.backgroundImage})` : 'none';
+ return style ? style.backgroundImage : '';
}
};
const getStatusStyle = statusIndex => {
- if (
- (permission.value.device_statistics_six === true &&
- permission.value.device_statistics_four === true) ||
- permission.value.device_statistics_six === true
- ) {
+ if (checked.value === '智飞工单') {
const style = zfstatusMapColor[statusIndex] || {
color: '#999',
borderLeftColor: '#999',
@@ -144,84 +160,77 @@
};
// 获取状态对应的文字颜色
const getStatusColor = statusIndex => {
- if (
- (permission.value.device_statistics_six === true &&
- permission.value.device_statistics_four === true) ||
- permission.value.device_statistics_six === true
- ) {
+ if (checked.value === '智飞工单') {
return zfstatusMapColor[statusIndex]?.color || '#999';
} else {
return statusMapColor[statusIndex]?.color || '#999';
}
};
+// 跳转到对应详情页
+const jumporder = val => {
+ if (checked.value === '智飞工单') {
+ const id = val.id;
+ getaddOrderRecord(id);
+ router.push({
+ path: `/tickets/orderLog`,
+ query: {
+ id,
+ },
+ });
+ } else {
+ getaddOrderRecord(val.id);
+ const orderNumber = val.event_num;
+ router.push({
+ path: `/tickets/ticket`,
+ query: {
+ orderNumber,
+ },
+ });
+ }
+};
+// 标记事件工单或智飞工单已读
+const getaddOrderRecord = async id => {
+ const ticketId = id;
+ if (checked.value === '事件工单') {
+ loading.value = true;
+ const type = 1;
+ const res = await addOrderRecordApi(type, ticketId);
+ } else if (checked.value === '智飞工单') {
+ loading.value = true;
+ const type = 2;
+ const res = await addOrderRecordApi(type, ticketId);
+ }
+};
+// 获取事件工单和智飞工单的数量
+const getOrderCount = async () => {
+ const res = await getOrderCountApi(userInfo.value.detail.areaCode);
+ const data = res.data.data;
+ titleList.value.forEach(item => {
+ if (data[item.label] !== undefined) {
+ item.number = data[item.label];
+ }
+ });
+};
+// 获取事件工单或者智飞工单的信息
const getListMatter = async () => {
- // console.log('permission.value', permission.value);
- if (
- (permission.value.device_statistics_six === true &&
- permission.value.device_statistics_four === true) ||
- permission.value.device_statistics_six === true
- ) {
+ if (checked.value === '事件工单') {
loading.value = true;
- // 0是智飞工单 运维
- const res = await getdaiban(0, userInfo.value.detail.areaCode);
+ const type = 1;
+ const res = await getOrderOrEventApi(type, userInfo.value.detail.areaCode);
todos.value = res.data.data || [];
- zfTotal.value = todos.value.length
- sjTotal.value = todos.value.length
- // console.log('todos.value', todos.value);
-
loading.value = false;
- } else if (
-
- // 1是事件工单
- permission.value.device_statistics_four === true &&
- permission.value.device_statistics_six !== true
- ) {
+ } else if (checked.value === '智飞工单') {
loading.value = true;
- const res = await getdaiban(1, userInfo.value.detail.areaCode);
+ const type = 2;
+ const res = await getOrderOrEventApi(type, userInfo.value.detail.areaCode);
todos.value = res.data.data || [];
- console.log('todos.value1', todos.value);
loading.value = false;
}
};
-// 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.device_statistics_four,
- permission.value.device_statistics_six,
- ],
- () => getListMatter(),
- { immediate: true }
-);
-const jumporder = val => {
- // if (permission.value.o_and_m_p_jump === true) {
- // const id = val.id;
- // router.push({
- // path: `/tickets/orderLog`,
- // query: {
- // id,
- // },
- // });
- // } else {
- // const orderNumber = val.event_num;
- // router.push({
- // path: `/tickets/ticket`,
- // query: {
- // orderNumber,
- // },
- // });
- // }
-};
onMounted(() => {
getListMatter();
+ getOrderCount();
});
</script>
@@ -266,16 +275,30 @@
border-bottom: 2px solid #1c5cff;
}
.dots {
- width: 13px;
- height: 13px;
+ width: 17px;
+ height: 17px;
border-radius: 50%;
- background: #366fff;
+ background: #366fff;
color: #fff;
- font-size: 10px;
+ font-size: 9px;
position: absolute;
top: -10px;
- right: -9px;
+ right: -13px;
padding: 1px;
+ line-height: 17px;
+ }
+ .dots1 {
+ width: 17px;
+ height: 17px;
+ border-radius: 50%;
+ background: none !important;
+ color: #366fff !important;
+ font-size: 9px;
+ position: absolute;
+ top: -10px;
+ right: -13px;
+ padding: 1px;
+ line-height: 17px;
}
}
.todo-items {
@@ -302,10 +325,12 @@
.status-indicator {
margin-left: 3px;
- width: 16px;
- height: 16px;
- // border-radius: 50%;
- // flex-shrink: 0;
+ width: 1.6rem;
+ height: 1.6rem;
+ img{
+ width: 100%;
+ height: 100%;
+ }
}
.content-wrapper {
@@ -330,13 +355,21 @@
}
.todo-text {
+ font-weight: 400;
font-size: 14px;
color: #343434;
}
.unread {
width: 5px;
height: 5px;
- background: #1c5cff;
+ background: #1c5cff !important;
+ border-radius: 50%;
+ margin: 0 4px;
+ }
+ .reads {
+ width: 5px;
+ height: 5px;
+ background: transparent;
border-radius: 50%;
margin: 0 4px;
}
@@ -346,10 +379,14 @@
display: flex;
align-items: center;
margin-right: 42px;
-
+ img {
+ width: 15px;
+ height: 15px;
+ }
.todo-date {
- color: #666;
- font-size: 0.9rem;
+ font-weight: 400;
+ font-size: 14px;
+ color: #5c6476;
margin-left: 2px;
}
}
--
Gitblit v1.9.3