From e827635de3e86c4b798ac3816824802f6d3a2d4d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 27 Jan 2026 10:23:04 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 20 +++++++++++++-------
applications/task-work-order/src/views/orderView/flyingHand/index.vue | 6 +++++-
applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue | 2 ++
applications/task-work-order/src/api/zkxt/index.js | 2 +-
applications/task-work-order/src/page/index/top/index.vue | 10 +++++-----
applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue | 6 +++++-
applications/task-work-order/src/views/orderView/flyingHand/flyingHandApi.js | 2 +-
7 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/applications/task-work-order/src/api/zkxt/index.js b/applications/task-work-order/src/api/zkxt/index.js
index fb32733..d294389 100644
--- a/applications/task-work-order/src/api/zkxt/index.js
+++ b/applications/task-work-order/src/api/zkxt/index.js
@@ -22,7 +22,7 @@
// 获取飞手信息
export const deviceFlyerApi = (data) => {
return request({
- url: `/deviceFlyer/deviceFlyer/queryList`,
+ url: `/webservice/webservice/deviceFlyer/queryList`,
method: 'post',
data: data,
})
diff --git a/applications/task-work-order/src/page/index/top/index.vue b/applications/task-work-order/src/page/index/top/index.vue
index 5869f4b..40cb024 100644
--- a/applications/task-work-order/src/page/index/top/index.vue
+++ b/applications/task-work-order/src/page/index/top/index.vue
@@ -3,12 +3,12 @@
<div class="top-bar__left">
任务工单管理子系统
</div>
-
+
<div class="top-bar__right">
<div class="top-user">
- <div class="icon-box">
- <img class="gateway" @click="jumpMH" src="@/assets/images/mh.png" alt="进入门户" title="进入门户">
- </div>
+<!-- <div class="icon-box">-->
+<!-- <img class="gateway" @click="jumpMH" src="@/assets/images/mh.png" alt="进入门户" title="进入门户">-->
+<!-- </div>-->
<el-dropdown>
<span class="el-dropdown-link">
@@ -23,7 +23,7 @@
<!-- <el-dropdown-item>
<router-link to="/info/index">{{ $t('navbar.userinfo') }}</router-link>
</el-dropdown-item> -->
- <el-dropdown-item @click="logout" divided>{{ $t('navbar.logOut') }}
+ <el-dropdown-item @click="logout">{{ $t('navbar.logOut') }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
index 61aa55f..000608e 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -124,10 +124,11 @@
</el-row>
</el-form>
<template #footer>
- <el-button @click="handleClose">取消</el-button>
+ <el-button color="#F2F3F5" @click="handleClose">取消</el-button>
<el-button
v-if="dialogType !== 'view'"
type="primary"
+ color="#4C34FF"
@click="handleSubmit"
>
确定
@@ -210,6 +211,12 @@
],
projectExperience: [
{ required: true, message: '请输入项目经验', trigger: 'blur' }
+ ],
+ technicalStrength: [
+ { required: true, message: '请选择技术特长', trigger: 'change' }
+ ],
+ skilledUavType: [
+ { required: true, message: '请选择擅长机型', trigger: 'change' }
]
}
@@ -235,14 +242,13 @@
formRef.value?.resetFields()
// 重置为默认值
Object.assign(formData, {
- name: '',
- phone: '',
+ flyerName: '',
+ flyerPhone: '',
flightHours: 0,
projectExperience: '',
- technicalSkills: '',
- technicalExpertise: '',
- goodAtAircraftType: '',
- goodAtTaskType: ''
+ technicalStrength: '',
+ skilledUavType: '',
+ skilledTaskType: ''
})
}
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/flyingHandApi.js b/applications/task-work-order/src/views/orderView/flyingHand/flyingHandApi.js
index 3d38189..9aab791 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/flyingHandApi.js
+++ b/applications/task-work-order/src/views/orderView/flyingHand/flyingHandApi.js
@@ -5,7 +5,7 @@
return request({
url: '/drone-gd/flyer/gdFlyer/page',
method: 'get',
- params
+ params: { descs: 'create_time', ...params },
})
}
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/index.vue b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
index ac5e9d1..b2764ed 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/index.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/index.vue
@@ -53,7 +53,11 @@
{{ getDictLabel(row.technicalStrength, dictObj.technicalStrength) }}
</template>
</el-table-column>
- <el-table-column prop="skilledUavType" show-overflow-tooltip label="擅长机型" />
+ <el-table-column prop="skilledUavType" show-overflow-tooltip label="擅长机型">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.skilledUavType, dictObj.skilledUavType) }}
+ </template>
+ </el-table-column>
<el-table-column prop="skilledTaskType" show-overflow-tooltip label="擅长任务类型">
<template v-slot="{ row }">
{{ getDictLabel(row.skilledTaskType, dictObj.skilledTaskType) }}
diff --git a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
index 19c592f..c518c41 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
@@ -33,7 +33,7 @@
<template v-slot="{ row }">
<el-link type="primary"
@click="openDistributeDialog(row)"
- :disabled="row.distributeStatus === 1 || currentRow.taskStatus !== '8'"
+ :disabled="!requester || (row.distributeStatus === 1 || currentRow.taskStatus !== '8')"
>
转为事件并分发
</el-link>
@@ -60,6 +60,10 @@
import { gdTaskResultListApi } from './achievementApi'
import DistributeDiaLog from './DistributeDiaLog.vue'
+const store = useStore()
+const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
+const activeName = ref('all')
+
const visible = defineModel()
const loading = ref(false)
const list = ref([])
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
index f0a01e1..9902395 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
@@ -149,6 +149,8 @@
const store = useStore()
const userInfo = computed(() => store.getters.userInfo)
+
+
// 初始化查询参数
const initSearchParams = () => ({
nickName: '',
--
Gitblit v1.9.3