车辆日志 任务日志 页面开发和接口对接
This commit is contained in:
yyy
parent
e04977d893
commit
4b0dcbd41f
11
src/api/map/logList.ts
Normal file
11
src/api/map/logList.ts
Normal file
@ -0,0 +1,11 @@
|
||||
import request from '@/config/axios'
|
||||
|
||||
//任务日志分页
|
||||
export const getRobotTaskPage = async (data) => {
|
||||
return await request.post({ url: `/system/robot/task/logPage`, data })
|
||||
}
|
||||
|
||||
//获得车辆动作记录分页
|
||||
export const getTaskDetailPage = async (params) => {
|
||||
return await request.get({ url: `/system/robot/task-detail-action-log/page`, params })
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick">
|
||||
<el-tab-pane :label="item.name" :name="item.id" v-for="item in tabList" :key="item.id">
|
||||
<el-tab-pane label="操作日志" name="1">
|
||||
<ContentWrap>
|
||||
<div class="form-table">
|
||||
<!-- 搜索工作栏 -->
|
||||
@ -12,16 +12,6 @@
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="车辆编号" prop="robotNo">
|
||||
<el-select v-model="queryParams.robotNo" class="!w-240px" @change="handleQuery()">
|
||||
<el-option
|
||||
v-for="car in robotList"
|
||||
:key="car.id"
|
||||
:label="car.robotNo"
|
||||
:value="car.robotNo"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.createTime"
|
||||
@ -55,9 +45,9 @@
|
||||
v-loading="loading"
|
||||
>
|
||||
<el-table-column label="序号" type="index" width="80" />
|
||||
<el-table-column prop="date" label="车辆编号" />
|
||||
<el-table-column prop="name" label="日志内容" />
|
||||
<el-table-column prop="address" label="发生时间" />
|
||||
<el-table-column prop="date" label="用户名" />
|
||||
<el-table-column prop="name" label="操作内容" />
|
||||
<el-table-column prop="address" label="操作时间" />
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
@ -69,32 +59,218 @@
|
||||
</div>
|
||||
</ContentWrap>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="车辆日志" name="2">
|
||||
<ContentWrap>
|
||||
<div class="form-table">
|
||||
<!-- 搜索工作栏 -->
|
||||
<el-form
|
||||
class=""
|
||||
:model="carLogParams"
|
||||
ref="queryFormRef"
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="车辆编号" prop="robotNo">
|
||||
<el-select v-model="carLogParams.robotNo" class="!w-240px" @change="handleQuery()">
|
||||
<el-option
|
||||
v-for="car in robotList"
|
||||
:key="car.id"
|
||||
:label="car.robotNo"
|
||||
:value="car.robotNo"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="createTime">
|
||||
<el-date-picker
|
||||
class="!w-240px"
|
||||
v-model="carLogParams.createTime"
|
||||
type="datetime"
|
||||
placeholder="请选择创建时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm:ss"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery"
|
||||
><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
|
||||
>
|
||||
<el-button @click="resetQuery"
|
||||
><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!-- 列表 -->
|
||||
<el-table
|
||||
:data="carLogList"
|
||||
style="width: 100%"
|
||||
class="mt-1"
|
||||
:header-cell-style="{
|
||||
backgroundColor: '#EBF1FF',
|
||||
color: '#0D162A',
|
||||
padding: '13px 0'
|
||||
}"
|
||||
v-loading="loading"
|
||||
>
|
||||
<el-table-column label="序号" type="index" width="80" />
|
||||
<el-table-column prop="robotNo" label="车辆编号" />
|
||||
<el-table-column prop="actionMsg" label="日志内容" />
|
||||
<el-table-column prop="createTime" label="发生时间" :formatter="dateFormatter" />
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
:total="carLogTotal"
|
||||
v-model:page="carLogParams.pageNo"
|
||||
v-model:limit="carLogParams.pageSize"
|
||||
@pagination="getCarLogList"
|
||||
/>
|
||||
</div>
|
||||
</ContentWrap>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="任务日志" name="3">
|
||||
<ContentWrap>
|
||||
<div class="form-table">
|
||||
<!-- 搜索工作栏 -->
|
||||
<el-form
|
||||
class=""
|
||||
:model="taskLogParams"
|
||||
ref="queryFormRef"
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="任务编号" prop="taskNo">
|
||||
<el-input
|
||||
v-model="taskLogParams.taskNo"
|
||||
placeholder="请输入任务ID"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="任务状态" prop="taskStatus">
|
||||
<el-select
|
||||
v-model="taskLogParams.taskStatus"
|
||||
class="!w-240px"
|
||||
clearable
|
||||
placeholder="请选择任务状态"
|
||||
@change="handleQuery()"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.ROBOT_TASK_STATUS)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="任务阶段" prop="taskStage">
|
||||
<el-select
|
||||
v-model="taskLogParams.taskStage"
|
||||
class="!w-240px"
|
||||
clearable
|
||||
placeholder="请选择任务阶段"
|
||||
@change="handleQuery()"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.ROBOT_QUEST_PHASES)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始时间" prop="startTime" :formatter="dateFormatter">
|
||||
<el-date-picker
|
||||
class="!w-240px"
|
||||
v-model="taskLogParams.startTime"
|
||||
type="datetime"
|
||||
placeholder="请选择开始时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm:ss"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="endTime" :formatter="dateFormatter">
|
||||
<el-date-picker
|
||||
class="!w-240px"
|
||||
v-model="taskLogParams.endTime"
|
||||
type="datetime"
|
||||
placeholder="请选择结束时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm:ss"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery"
|
||||
><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
|
||||
>
|
||||
<el-button @click="resetQuery"
|
||||
><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!-- 列表 -->
|
||||
<el-table
|
||||
:data="taskLogList"
|
||||
style="width: 100%"
|
||||
class="mt-1"
|
||||
:header-cell-style="{
|
||||
backgroundColor: '#EBF1FF',
|
||||
color: '#0D162A',
|
||||
padding: '13px 0'
|
||||
}"
|
||||
v-loading="loading"
|
||||
>
|
||||
<el-table-column label="序号" type="index" width="80" align="center" />
|
||||
<el-table-column prop="taskNo" label="任务编号" align="center" />
|
||||
<el-table-column prop="taskType" label="任务类型" align="center" width="120">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.taskType == 1">取放货</el-text>
|
||||
<el-text v-if="scope.row.taskType == 2">停车</el-text>
|
||||
<el-text v-if="scope.row.taskType == 3">充电</el-text>
|
||||
<el-text v-if="scope.row.taskType == 4">充电</el-text>
|
||||
<el-text v-if="scope.row.taskType == 5">仅取货</el-text>
|
||||
<el-text v-if="scope.row.taskType == 6">仅放货</el-text>
|
||||
<el-text v-if="scope.row.taskType == 7">扫描码</el-text>
|
||||
<el-text v-if="scope.row.taskType == 8">检测托盘类型</el-text>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="msg" label="任务内容" align="center" show-overflow-tooltip />
|
||||
<el-table-column prop="taskStatus" label="任务阶段" align="center" width="120">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.taskStatus == 0">未开始</el-text>
|
||||
<el-text v-if="scope.row.taskStatus == 1">执行中</el-text>
|
||||
<el-text v-if="scope.row.taskStatus == 2">已完成</el-text>
|
||||
<el-text v-if="scope.row.taskStatus == 3">已取消</el-text>
|
||||
<el-text v-if="scope.row.taskStatus == 4">异常</el-text>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="startTime" label="开始时间" align="center" width="150" />
|
||||
<el-table-column prop="endTime" label="结束时间" align="center" width="150" />
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
:total="taskLogTotal"
|
||||
v-model:page="taskLogParams.pageNo"
|
||||
v-model:limit="taskLogParams.pageSize"
|
||||
@pagination="getTaskLogList"
|
||||
/>
|
||||
</div>
|
||||
</ContentWrap>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import * as LogListAPi from '@/api/map/logList'
|
||||
import * as MapTaskAPi from '@/api/map/mapTask'
|
||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
|
||||
defineOptions({ name: 'mapLogQueriesList' })
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
||||
const tabList = ref([
|
||||
{
|
||||
name: '操作日志',
|
||||
id: 1
|
||||
},
|
||||
{
|
||||
name: '车辆日志',
|
||||
id: 2
|
||||
},
|
||||
{
|
||||
name: '任务日志',
|
||||
id: 3
|
||||
}
|
||||
])
|
||||
const activeName = ref(1) //tab栏
|
||||
const activeName = ref('1') //tab栏
|
||||
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const total = ref(0) // 列表的总页数
|
||||
@ -106,48 +282,82 @@ const queryParams = reactive({
|
||||
createTime: []
|
||||
})
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
//操作日志
|
||||
const operationLogParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
createTime: []
|
||||
})
|
||||
const operationLogList = ref()
|
||||
const operationLogTotal = ref(0)
|
||||
const getOperationLogList = () => {
|
||||
loading.value = false
|
||||
}
|
||||
//车辆日志
|
||||
const carLogParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
robotNo: null,
|
||||
createTime: []
|
||||
})
|
||||
const carLogList = ref()
|
||||
const carLogTotal = ref(0)
|
||||
const getCarLogList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
// const data = await MapTaskAPi.getList(queryParams)
|
||||
// list.value = data.list
|
||||
// total.value = data.total
|
||||
list.value = [
|
||||
{
|
||||
date: '2016-05-03',
|
||||
name: 'Tom',
|
||||
address: 'No. 189, Grove St, Los Angeles'
|
||||
},
|
||||
{
|
||||
date: '2016-05-02',
|
||||
name: 'Tom',
|
||||
address: 'No. 189, Grove St, Los Angeles'
|
||||
},
|
||||
{
|
||||
date: '2016-05-04',
|
||||
name: 'Tom',
|
||||
address: 'No. 189, Grove St, Los Angeles'
|
||||
},
|
||||
{
|
||||
date: '2016-05-01',
|
||||
name: 'Tom',
|
||||
address: 'No. 189, Grove St, Los Angeles'
|
||||
}
|
||||
]
|
||||
const data = await LogListAPi.getTaskDetailPage(carLogParams)
|
||||
carLogList.value = data.list
|
||||
carLogTotal.value = data.total
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
//任务日志
|
||||
const taskLogParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
taskNo: null, //任务编号
|
||||
taskType: null, //任务类型
|
||||
taskStatus: null, //任务状态
|
||||
startTime: null, //开始时间
|
||||
endTime: null //结束时间
|
||||
})
|
||||
const taskLogList = ref()
|
||||
const taskLogTotal = ref(0)
|
||||
const getTaskLogList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await LogListAPi.getRobotTaskPage(taskLogParams)
|
||||
taskLogList.value = data.list
|
||||
taskLogTotal.value = data.total
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleClick = () => {
|
||||
console.log(activeName.value)
|
||||
const handleClick = (e) => {
|
||||
activeName.value = e.props.name
|
||||
if (activeName.value == 1) {
|
||||
getOperationLogList()
|
||||
} else if (activeName.value == 2) {
|
||||
getCarLogList()
|
||||
} else if (activeName.value == 3) {
|
||||
getTaskLogList()
|
||||
}
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
if (activeName.value == 1) {
|
||||
operationLogParams.pageNo = 1
|
||||
getOperationLogList()
|
||||
} else if (activeName.value == 2) {
|
||||
carLogParams.pageNo = 1
|
||||
getCarLogList()
|
||||
} else if (activeName.value == 3) {
|
||||
taskLogParams.pageNo = 1
|
||||
getTaskLogList()
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
@ -164,7 +374,7 @@ const getCanUseRobotList = async () => {
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getList()
|
||||
getOperationLogList()
|
||||
getCanUseRobotList()
|
||||
})
|
||||
</script>
|
||||
|
||||
@ -24,28 +24,16 @@
|
||||
<div v-if="legendObj.driveLineShow">
|
||||
<div class="line-box" v-for="(item, index) in lineList" :key="index">
|
||||
<svg id="svg" :width="widthVal" :height="heightVal">
|
||||
<!-- 定义箭头 -->
|
||||
<defs>
|
||||
<marker
|
||||
id="forward-arrow"
|
||||
viewBox="0 0 10 10"
|
||||
refX="10"
|
||||
refY="5"
|
||||
orient="auto"
|
||||
>
|
||||
<path d="M 0 0 L 10 5 L 0 10 z" fill="black" />
|
||||
</marker>
|
||||
<!-- 反向箭头 -->
|
||||
<marker
|
||||
id="backward-arrow"
|
||||
viewBox="0 0 10 10"
|
||||
refX="0"
|
||||
refY="5"
|
||||
orient="auto"
|
||||
>
|
||||
<path d="M 10 0 L 0 5 L 10 10 z" fill="black" />
|
||||
</marker>
|
||||
</defs>
|
||||
<!-- 定义箭头 -->
|
||||
<defs>
|
||||
<marker id="forward-arrow" viewBox="0 0 10 10" refX="10" refY="5" orient="auto">
|
||||
<path d="M 0 0 L 10 5 L 0 10 z" fill="black" />
|
||||
</marker>
|
||||
<!-- 反向箭头 -->
|
||||
<marker id="backward-arrow" viewBox="0 0 10 10" refX="0" refY="5" orient="auto">
|
||||
<path d="M 10 0 L 0 5 L 10 10 z" fill="black" />
|
||||
</marker>
|
||||
</defs>
|
||||
<template v-if="item.method == 0">
|
||||
<line
|
||||
:x1="(Number(item.startPointX) + Number(item.beginWidth) / 2) * radio"
|
||||
@ -55,18 +43,18 @@
|
||||
stroke="#00329F"
|
||||
:stroke-width="5 * radio"
|
||||
:marker-start="item.direction === 2 ? 'url(#double-arrow-start)' : ''"
|
||||
marker-end="url(#single-arrow)"
|
||||
marker-end="url(#single-arrow)"
|
||||
/>
|
||||
<path
|
||||
:d="getLineMidArrowPath(item)"
|
||||
stroke="none"
|
||||
fill="black"
|
||||
stroke-width="4"
|
||||
:marker-start="item.direction === 2 ? 'url(#backward-arrow)' : ''"
|
||||
:marker-end="
|
||||
item.direction === 2 ? 'url(#forward-arrow)' : 'url(#forward-arrow)'
|
||||
"
|
||||
/>
|
||||
:d="getLineMidArrowPath(item)"
|
||||
stroke="none"
|
||||
fill="black"
|
||||
stroke-width="4"
|
||||
:marker-start="item.direction === 2 ? 'url(#backward-arrow)' : ''"
|
||||
:marker-end="
|
||||
item.direction === 2 ? 'url(#forward-arrow)' : 'url(#forward-arrow)'
|
||||
"
|
||||
/>
|
||||
</template>
|
||||
<template v-else>
|
||||
<path
|
||||
@ -76,8 +64,8 @@
|
||||
fill="none"
|
||||
:marker-start="item.direction === 2 ? 'url(#backward-arrow)' : ''"
|
||||
:marker-end="
|
||||
item.direction === 2 ? 'url(#forward-arrow)' : 'url(#forward-arrow)'
|
||||
"
|
||||
item.direction === 2 ? 'url(#forward-arrow)' : 'url(#forward-arrow)'
|
||||
"
|
||||
/>
|
||||
</template>
|
||||
</svg>
|
||||
@ -282,10 +270,15 @@
|
||||
placement="top"
|
||||
v-if="item.type == 1"
|
||||
>
|
||||
|
||||
<div :style="{ width: 10 * radio + 'px', height: 10 * radio + 'px', background: '#000',borderRadius:'50%'}">
|
||||
</div>
|
||||
|
||||
<div
|
||||
:style="{
|
||||
width: 10 * radio + 'px',
|
||||
height: 10 * radio + 'px',
|
||||
background: '#000',
|
||||
borderRadius: '50%'
|
||||
}"
|
||||
>
|
||||
</div>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
@ -656,11 +649,11 @@ const resetPosition = () => {
|
||||
}
|
||||
// 计算直线中间箭头的路径
|
||||
const getLineMidArrowPath = (item) => {
|
||||
const midX = (Number(item.startPointX) + Number(item.endPointX)) / 2 * radio.value
|
||||
const midY = (Number(item.startPointY) + Number(item.endPointY)) / 2 * radio.value
|
||||
const midX = ((Number(item.startPointX) + Number(item.endPointX)) / 2) * radio.value
|
||||
const midY = ((Number(item.startPointY) + Number(item.endPointY)) / 2) * radio.value
|
||||
|
||||
let dx = item.endPointX* radio.value - item.startPointX* radio.value
|
||||
let dy = item.endPointY* radio.value - item.startPointY* radio.value
|
||||
let dx = item.endPointX * radio.value - item.startPointX * radio.value
|
||||
let dy = item.endPointY * radio.value - item.startPointY * radio.value
|
||||
let length = Math.sqrt(dx * dx + dy * dy)
|
||||
|
||||
if (length === 0) {
|
||||
|
||||
@ -2037,7 +2037,7 @@ const getAllNodeList = async () => {
|
||||
item.locationX = Number(item.locationX)
|
||||
item.locationY = Number(item.locationY)
|
||||
|
||||
if (item.type === 1 || item.type === 5 || item.type === 6) {
|
||||
if (item.type === 1) {
|
||||
item.dataObj = {}
|
||||
item.dataList = []
|
||||
item.locationDeep = 50
|
||||
|
||||
Loading…
Reference in New Issue
Block a user