From 039679bf092a8a6cb1f8c921c8a2cfa5306dcf73 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 26 Feb 2026 14:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/deviceInvocation/deviceCallRecord/index.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/systemMange/userMange/index.vue b/applications/task-work-order/src/views/orderView/deviceInvocation/deviceCallRecord/index.vue
similarity index 91%
copy from applications/task-work-order/src/views/orderView/systemMange/userMange/index.vue
copy to applications/task-work-order/src/views/orderView/deviceInvocation/deviceCallRecord/index.vue
index d18d70e..862a156 100644
--- a/applications/task-work-order/src/views/orderView/systemMange/userMange/index.vue
+++ b/applications/task-work-order/src/views/orderView/deviceInvocation/deviceCallRecord/index.vue
@@ -60,16 +60,17 @@
<el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="46" />
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
- <el-table-column prop="account" show-overflow-tooltip label="登录账号" />
- <el-table-column prop="realName" show-overflow-tooltip label="用户姓名" />
- <el-table-column prop="roleName" show-overflow-tooltip label="所属角色" />
- <el-table-column prop="deptName" show-overflow-tooltip label="所属部门" />
- <el-table-column prop="phone" show-overflow-tooltip width="120" label="手机号" />
+ <el-table-column prop="account" show-overflow-tooltip label="任务名称" />
+ <el-table-column prop="realName" show-overflow-tooltip label="发起任务部门" />
+ <el-table-column prop="roleName" show-overflow-tooltip label="任务发起人" />
+ <el-table-column prop="deptName" show-overflow-tooltip label="飞行时长" />
+ <el-table-column prop="phone" show-overflow-tooltip label="飞行里程(m)" />
+ <el-table-column prop="phone" show-overflow-tooltip label="执行设备" />
+ <el-table-column prop="phone" show-overflow-tooltip label="计划执行时间" />
+ <el-table-column prop="phone" show-overflow-tooltip label="实际执行时间" />
<el-table-column label="操作" class-name="operation-btns" width="180">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
- <el-link v-if="permission.orderUser_edit" @click="handleEdit(row)">编辑</el-link>
- <el-link v-if="permission.orderUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>
</template>
</el-table-column>
</el-table>
@@ -108,7 +109,7 @@
deptId: '',
current: 1,
size: 10,
- sysType: 6
+ // sysType: 6
})
const searchParams = ref(initSearchParams())
@@ -133,7 +134,7 @@
const res = await getUserList(
searchParams.value.current,
searchParams.value.size,
- searchParams.value.sysType,
+ // searchParams.value.sysType,
{
account: searchParams.value.account,
realName: searchParams.value.realName,
--
Gitblit v1.9.3