From 540291d3626bb21130f5be72bf55c5dd370a5373 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 22 Jan 2026 10:49:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/vite.config.mjs | 2 +-
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 17 +++++++++++++++--
applications/drone-command/vite.config.mjs | 2 +-
applications/mobile-web-view/vite.config.mjs | 2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/vite.config.mjs b/applications/drone-command/vite.config.mjs
index cc99c15..6919fc7 100644
--- a/applications/drone-command/vite.config.mjs
+++ b/applications/drone-command/vite.config.mjs
@@ -38,7 +38,7 @@
__INTLIFY_PROD_DEVTOOLS__: false,
},
server: {
- port: 5174,
+ port: 5177,
// host: '192.168.1.178',
proxy: {
'/api': {
diff --git a/applications/mobile-web-view/vite.config.mjs b/applications/mobile-web-view/vite.config.mjs
index e706f61..8a2bf9a 100644
--- a/applications/mobile-web-view/vite.config.mjs
+++ b/applications/mobile-web-view/vite.config.mjs
@@ -67,7 +67,7 @@
// key: fs.readFileSync('./127.0.0.1+3-key.pem'), // 私钥路径
// cert: fs.readFileSync('./127.0.0.1+3.pem'), // 证书路径
// },
- port: 5175,
+ port: 5179,
proxy: {
'/aisky-webodm-vol': {
target: 'https://wrj.shuixiongit.com/aisky-webodm-vol',
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index 6a1fd8d..1198ba4 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -1,5 +1,9 @@
<template>
<basic-container>
+ <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+ <el-tab-pane label="全部 " name="all"></el-tab-pane>
+ <el-tab-pane label="我的任务工单" name="my"></el-tab-pane>
+ </el-tabs>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="工单名称" prop="workOrderName">
<el-input
@@ -148,7 +152,7 @@
const store = useStore()
const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
-
+const activeName = ref('all')
// 初始化查询参数
const initSearchParams = () => ({
@@ -185,7 +189,12 @@
const range = dateRangeFormat(dateRange.value)
loading.value = true
try {
- const res = await gdWorkOrderPageApi({ ...searchParams.value, startTime: range[0], endTime: range[1] })
+ const res = await gdWorkOrderPageApi({
+ ...searchParams.value,
+ startTime: range[0],
+ endTime: range[1],
+ createUser: activeName.value === 'user' ? store.state.user.userInfo.user_id : '',
+ })
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
} finally {
@@ -207,6 +216,10 @@
getList()
}
+function handleClick(tab,event) {
+ handleSearch()
+}
+
// 新增/编辑/查看 弹框
function openForm(mode, row) {
dialogVisible.value = true
diff --git a/applications/task-work-order/vite.config.mjs b/applications/task-work-order/vite.config.mjs
index b314de5..f29b570 100644
--- a/applications/task-work-order/vite.config.mjs
+++ b/applications/task-work-order/vite.config.mjs
@@ -38,7 +38,7 @@
__INTLIFY_PROD_DEVTOOLS__: false,
},
server: {
- port: 5174,
+ port: 5178,
// host: '192.168.1.178',
proxy: {
'/api': {
--
Gitblit v1.9.3