ak/zn-admin-vue3-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

库位名建议保持和库位列表命名一致，改为“库位号”

Browse Source
This commit is contained in:
yyy 2025-03-25 11:46:49 +08:00
parent 47ec7b8bfb
commit 5e13c6975f
3 changed files with 83 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/board/allBoard/indexPage.vue
View File

@ -154,7 +154,7 @@
</template>
<div>
<div class="indexpage-popover-item">
<div> 库位名： </div>
<div> 库位号： </div>
<div>
{{ item.showData?.locationNo || '' }}
</div>
@ -713,7 +713,7 @@ const linkWebSocket = (url) => {
let data = JSON.parse(jsonMsg.content)
// console.log('======规划路线======', JSON.parse(data).data)
let dataList = JSON.parse(data).data
if(lineList.value.length > 0) {
if (lineList.value.length > 0) {
console.log(lineList.value)
lineList.value = setIsSelect(lineList.value, dataList)
}
@ -721,13 +721,13 @@ const linkWebSocket = (url) => {
})
}
}
const setIsSelect =(arr1, arr2) => {
const setIsSelect = (arr1, arr2) => {
for (let i = 0; i < arr1.length; i++) {
const element = arr1[i];
const isExist = arr2.includes(element.id);
element.isSelect = isExist;
const element = arr1[i]
const isExist = arr2.includes(element.id)
element.isSelect = isExist
}
return arr1;
return arr1
}
// 查看更多异常列表
const lookError = () => {

14
src/views/mapPage/realTimeMap/components/copyOld.vue
View File

@ -154,7 +154,7 @@
</template>
<div>
<div class="indexpage-popover-item">
<div> 库位名： </div>
<div> 库位号： </div>
<div>
{{ item.showData?.locationNo || '' }}
</div>
@ -713,7 +713,7 @@ const linkWebSocket = (url) => {
let data = JSON.parse(jsonMsg.content)
// console.log('======规划路线======', JSON.parse(data).data)
let dataList = JSON.parse(data).data
if(lineList.value.length > 0) {
if (lineList.value.length > 0) {
console.log(lineList.value)
lineList.value = setIsSelect(lineList.value, dataList)
}
@ -722,13 +722,13 @@ const linkWebSocket = (url) => {
}
}
const setIsSelect =(arr1, arr2) => {
const setIsSelect = (arr1, arr2) => {
for (let i = 0; i < arr1.length; i++) {
const element = arr1[i];
const isExist = arr2.includes(element.id);
element.isSelect = isExist;
const element = arr1[i]
const isExist = arr2.includes(element.id)
element.isSelect = isExist
}
return arr1;
return arr1
}
// 查看更多异常列表
const lookError = () => {

35
src/views/mapPage/realTimeMap/components/indexPage.vue
View File

@ -7,7 +7,7 @@
cursor: isDrag ? 'pointer' : 'default',
scale: isSizeRadio,
transformOrigin: '0 0',
width: isFull?'100%':(widthVal + 'px')
width: isFull ? '100%' : widthVal + 'px'
}"
@wheel="handleWheel"
>
@ -156,7 +156,7 @@
</template>
<div>
<div class="indexpage-popover-item">
<div> 库位名： </div>
<div> 库位号： </div>
<div>
{{ item.showData?.locationNo || '' }}
</div>
@ -177,7 +177,7 @@
</el-popover>
<!-- 设备点 -->
<el-popover placement="top-start" trigger="hover" width="auto" v-if="item.type == 3" >
<el-popover placement="top-start" trigger="hover" width="auto" v-if="item.type == 3">
<template #reference>
<img
v-if="item.type == 3"
@ -198,7 +198,7 @@
<div class="indexpage-popover-item">
<div> 设备类型： </div>
<div>
{{ item.showData?filterTypeFun(item.showData.deviceType, typeList) : '' }}
{{ item.showData ? filterTypeFun(item.showData.deviceType, typeList) : '' }}
</div>
</div>
</div>
@ -375,13 +375,15 @@ const nodeStyle = (item, index) => {
const typeList = ref([])
const getTypeList = () => {
typeList.value = getDictOptions(DICT_TYPE.DEVICE_TYPE)&&getDictOptions(DICT_TYPE.DEVICE_TYPE).length?JSON.parse(JSON.stringify(getDictOptions(DICT_TYPE.DEVICE_TYPE))):[]
typeList.value =
getDictOptions(DICT_TYPE.DEVICE_TYPE) && getDictOptions(DICT_TYPE.DEVICE_TYPE).length
? JSON.parse(JSON.stringify(getDictOptions(DICT_TYPE.DEVICE_TYPE)))
: []
}
//根据type和列表返回对应中文
const filterTypeFun = (type, list) => {
if (list.length) {
let obj = list.find(item => {
let obj = list.find((item) => {
return item.value == type
})
return obj == undefined ? type : obj.label
@ -484,7 +486,6 @@ const changDriveLineShow = () => {
const toggleFullScreen = () => {
var elem = document.getElementById('indexpage-container') // 获取元素
if (!document.fullscreenElement) {
// 检查是否已经是全屏模式
if (elem.requestFullscreen) {
// 支持requestFullscreen API的标准方式
@ -620,7 +621,11 @@ const getPositionMapListFun = async (positionMapId) => {
pointList.value?.forEach((item) => {
item.formattedData = item.dataJson ? JSON.parse(item.dataJson) : ''
// console.log(JSON.parse(item.dataJson),item.type)
item.showData = item.dataJson ? (item.type == 2 ? JSON.parse(item.dataJson)[0] : JSON.parse(item.dataJson)) : null
item.showData = item.dataJson
? item.type == 2
? JSON.parse(item.dataJson)[0]
: JSON.parse(item.dataJson)
: null
item.imgUrl = formatTypeImg(item.type)
if (item.type === 1) {
@ -796,7 +801,7 @@ const linkWebSocket = (url) => {
let data = JSON.parse(jsonMsg.content)
// console.log('======规划路线======', JSON.parse(data).data)
let dataList = JSON.parse(data).data
if(lineList.value.length > 0) {
if (lineList.value.length > 0) {
console.log(lineList.value)
lineList.value = setIsSelect(lineList.value, dataList)
}
@ -804,13 +809,13 @@ const linkWebSocket = (url) => {
})
}
}
const setIsSelect =(arr1, arr2) => {
const setIsSelect = (arr1, arr2) => {
for (let i = 0; i < arr1.length; i++) {
const element = arr1[i];
const isExist = arr2.includes(element.id);
element.isSelect = isExist;
const element = arr1[i]
const isExist = arr2.includes(element.id)
element.isSelect = isExist
}
return arr1;
return arr1
}
// 查看更多异常列表