Compare commits

..

No commits in common. "945708ccc9f0db5fb44c89edca092c9ff5634ea4" and "f8abe2f791ff977e1d933e38d1c31074ab0ccf00" have entirely different histories.

3 changed files with 54 additions and 56 deletions

View File

@ -180,7 +180,9 @@
v-if="item.robotCodeLevel == 1"
>
<template #content>
<span style="font-size: 14px; color: #fff">{{ item.robotCodeMsg || '' }} </span>
<span style="font-size: 14px; color: #fff"
>{{ item.robotCodeMsg || '' }}
</span>
<span
style="cursor: pointer; margin-left: 24px; color: #ff4d4f; font-size: 14px"
@click="goMoreError(item)"
@ -197,7 +199,9 @@
v-if="item.robotCodeLevel == 2"
>
<template #content>
<span style="font-size: 14px; color: #fff">{{ item.robotCodeMsg || '' }} </span>
<span style="font-size: 14px; color: #fff"
>{{ item.robotCodeMsg || '' }}
</span>
<span
style="cursor: pointer; margin-left: 24px; color: #ff4d4f; font-size: 14px"
@click="goMoreError(item)"
@ -214,7 +218,9 @@
v-if="item.robotCodeLevel == 3"
>
<template #content>
<span style="font-size: 14px; color: #fff">{{ item.robotCodeMsg || '' }} </span>
<span style="font-size: 14px; color: #fff"
>{{ item.robotCodeMsg || '' }}
</span>
<span
style="cursor: pointer; margin-left: 24px; color: #ff4d4f; font-size: 14px"
@click="goMoreError(item)"
@ -231,7 +237,9 @@
v-if="item.robotCodeLevel == 4"
>
<template #content>
<span style="font-size: 14px; color: #fff">{{ item.robotCodeMsg || '' }} </span>
<span style="font-size: 14px; color: #fff"
>{{ item.robotCodeMsg || '' }}
</span>
<span
style="cursor: pointer; margin-left: 24px; color: #ff4d4f; font-size: 14px"
@click="goMoreError(item)"
@ -343,6 +351,7 @@
</template>
<script setup>
import JSONBigInt from 'json-bigint'
import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
import * as CarApi from '@/api/car/index'
import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
@ -469,15 +478,15 @@ const stopCar = (robotNo) => {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
})
.then(() => {
CarApi.stopCar({ robotNo }).then((res) => {
getCarList()
fetchData()
message.success('暂停成功')
})
})
.catch(() => {})
})
.catch(() => {})
}
const changeRobotStatisticsType = (type) => {
@ -691,7 +700,9 @@ onBeforeRouteLeave((to, from, next) => {
}
.new-top-box-left-title {
font-family: PingFangSC, 'PingFang SC';
font-family:
PingFangSC,
"PingFang SC";
font-weight: 500;
font-size: 18px;
color: #0d162a;
@ -700,7 +711,9 @@ onBeforeRouteLeave((to, from, next) => {
.new-top-box-left-statistics {
padding: 5px 7px;
margin-left: 4px;
font-family: PingFangSC, 'PingFang SC';
font-family:
PingFangSC,
"PingFang SC";
font-weight: 500;
font-size: 16px;
color: #0d162a;
@ -719,7 +732,9 @@ onBeforeRouteLeave((to, from, next) => {
display: flex;
align-items: center;
flex-shrink: 0;
font-family: PingFangSC, 'PingFang SC';
font-family:
PingFangSC,
"PingFang SC";
font-weight: 500;
font-size: 16px;
padding: 5px 10px;
@ -794,7 +809,9 @@ input::input-placeholder {
.item-inner-left-name {
flex: 1;
margin-right: 5px;
font-family: PingFangSC, 'PingFang SC';
font-family:
PingFangSC,
"PingFang SC";
font-weight: 600;
font-size: 14px;
width: 0;
@ -820,7 +837,9 @@ input::input-placeholder {
}
.item-inner-left-bottom-btn {
font-family: PingFangSC, 'PingFang SC';
font-family:
PingFangSC,
"PingFang SC";
font-weight: 400;
font-size: 14px;
color: #1677ff;
@ -863,7 +882,9 @@ input::input-placeholder {
}
.item-inner-right-msg-item-name {
font-family: PingFangSC, 'PingFang SC';
font-family:
PingFangSC,
"PingFang SC";
font-weight: 400;
font-size: 14px;
width: 60px;

View File

@ -966,7 +966,6 @@
@click.stop
>
<div class="context-menu-item" @click="deleteSingleNode">删除</div>
<div class="context-menu-item" @click="contextMenuEditNode">编辑节点</div>
<div
class="context-menu-item"
@click="generateDetectionPoint"
@ -1234,7 +1233,6 @@ const activatedHandle = (item, index) => {
editNodePropertiesRef.value.open(JSON.parse(JSON.stringify(item)), list)
}
}
//
const deactivatedHandle = () => {}
@ -2128,7 +2126,7 @@ const hideContextMenu = () => {
state.contextMenu.currentIndex = -1
}
//
//
const deleteSingleNode = () => {
if (state.contextMenu.currentIndex !== -1) {
let deleteId = state.allMapPointInfo[state.contextMenu.currentIndex].id
@ -2146,32 +2144,14 @@ const deleteSingleNode = () => {
}
}
//
const contextMenuEditNode = () => {
if (state.contextMenu.currentItem.type !== 7) {
let list = state.allMapPointInfo.filter((item) => item.type === 3)
removeEventListener() //
editNodePropertiesRef.value.open(
JSON.parse(JSON.stringify(state.contextMenu.currentItem)),
list
)
//
hideContextMenu()
}
}
//
const generateDetectionPoint = async () => {
if (state.contextMenu.currentIndex === -1) return
if (!state.contextMenu.currentItem.id) {
return message.warning('该库位未保存')
}
const { locationX, locationY, locationYaw, id, actualLocationX, actualLocationY } =
state.contextMenu.currentItem
const { locationX, locationY, locationYaw } = state.contextMenu.currentItem
const newId = await MapApi.getNodeId()
const distance = 2 / Number(imgBgObj.resolution) //
const distance = 1 / Number(imgBgObj.resolution) //
// 使
const angle = locationYaw * (180 / Math.PI)
@ -2190,7 +2170,6 @@ const generateDetectionPoint = async () => {
if (!isDuplicate) {
let actualPoint = disposeEventPoint(newX, newY)
//
let pointItem = {
id: newId,
positionMapId: imgBgObj.positionMapId,
@ -2215,19 +2194,19 @@ const generateDetectionPoint = async () => {
dataObj: {}
}
//线
//线
let newRoute = {
isSelected: false,
startingPointId: newId,
endPointId: id,
startPointX: newX,
startPointY: newY,
actualStartPointX: actualPoint.actualLocationX,
actualStartPointY: actualPoint.actualLocationY,
endPointX: locationX,
endPointY: locationY,
actualEndPointX: actualLocationX,
actualEndPointY: actualLocationY,
startingPointId: undefined,
endPointId: undefined,
startPointX: undefined,
startPointY: undefined,
endPointX: undefined,
endPointY: undefined,
actualStartPointX: undefined,
actualStartPointY: undefined,
actualEndPointX: undefined,
actualEndPointY: undefined,
actualBeginControlX: '',
actualBeginControlY: '',
actualEndControlX: '',
@ -2242,19 +2221,17 @@ const generateDetectionPoint = async () => {
expansionZoneRight: 0,
method: 0,
direction: 2, //12
forwardSpeedLimit: 0.4,
reverseSpeedLimit: 0.2,
forwardSpeedLimit: 1.5,
reverseSpeedLimit: 0.4,
toward: 0,
startingSortNum: undefined,
endPointSortNum: undefined,
startToEndToward: 1, //
endToStartToward: 0 //
endPointSortNum: undefined
}
//
state.allMapPointInfo.push(pointItem)
//线线
state.mapRouteList.push(newRoute)
// state.mapRouteList.push(newRoute)
addEditHistory()
//

View File

@ -49,7 +49,7 @@
class="!w-220px"
v-model="formData.montageNumber"
:min="1"
:max="100"
:max="10"
@change="montageNumberChange"
/>
</el-form-item>