diff --git a/src/assets/imgs/allBoard/dianlianggreen.png b/src/assets/imgs/allBoard/dianlianggreen.png new file mode 100644 index 00000000..1d564a41 Binary files /dev/null and b/src/assets/imgs/allBoard/dianlianggreen.png differ diff --git a/src/assets/imgs/allBoard/dianliangred.png b/src/assets/imgs/allBoard/dianliangred.png new file mode 100644 index 00000000..dd04c078 Binary files /dev/null and b/src/assets/imgs/allBoard/dianliangred.png differ diff --git a/src/assets/imgs/allBoard/dianliangyellow.png b/src/assets/imgs/allBoard/dianliangyellow.png new file mode 100644 index 00000000..e17abec2 Binary files /dev/null and b/src/assets/imgs/allBoard/dianliangyellow.png differ diff --git a/src/views/board/allBoard/index.vue b/src/views/board/allBoard/index.vue index 426b5668..93467fba 100644 --- a/src/views/board/allBoard/index.vue +++ b/src/views/board/allBoard/index.vue @@ -1,6 +1,6 @@ -@/api/boardCharts/index \ No newline at end of file diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue index 27a4c111..8444b0fd 100644 --- a/src/views/mapPage/realTimeMap/components/indexPage.vue +++ b/src/views/mapPage/realTimeMap/components/indexPage.vue @@ -6,7 +6,7 @@ height: heightVal * radio + 'px', cursor: isDrag ? 'pointer' : 'default', scale: isSizeRaio, - transformOrigin: 'center center' + transformOrigin: '0 0' }" >
@@ -136,8 +140,14 @@ class="indexpage-container-box-point-item-inner" v-if="item.type == 3" :style="{ - width: item.formattedData.locationWide * radio + 'px', - height: item.formattedData.locationDeep * radio + 'px' + width: + (item.formattedData.locationWide / nowObject.showYamlJson.resolution / 100) * + radio + + 'px', + height: + (item.formattedData.locationDeep / nowObject.showYamlJson.resolution / 100) * + radio + + 'px' }" >
@@ -157,8 +167,14 @@ class="indexpage-container-box-point-item-inner" v-if="item.type == 4" :style="{ - width: item.formattedData.locationWide * radio + 'px', - height: item.formattedData.locationDeep * radio + 'px' + width: + (item.formattedData.locationWide / nowObject.showYamlJson.resolution / 100) * + radio + + 'px', + height: + (item.formattedData.locationDeep / nowObject.showYamlJson.resolution / 100) * + radio + + 'px' }" >
@@ -215,11 +231,17 @@ />
-
+ -
+
+
+
@@ -368,7 +390,7 @@ const carPointListFun = () => { data: JSON.parse(data[key]) }) } - console.log('=====', dataList) + // console.log('=====', dataList) testCarList.value = dataList // let data2 = JSON.parse(data['d0:65:78:c4:af:cc']) @@ -379,7 +401,7 @@ const isDrag = ref(false) const changeIsDrag = () => { nextTick(() => { isDrag.value = !isDrag.value - console.log(isDrag.value) + // console.log(isDrag.value) if (!isDrag.value) { //还原位置 resetPosition() @@ -528,7 +550,7 @@ const getList = async () => { } list.value = mapList - console.log(list.value, data) + // console.log(list.value, data) //默认取第一个 if (data[1][0]) { getMapData(data[1][0]) @@ -536,12 +558,12 @@ const getList = async () => { } //库位双击 const storeClick = async (item) => { - console.log(item) + // console.log(item) let storeData = await MapApi.houseLocationGetByMapItemId({ mapId: item.positionMapId, mapItemId: item.id }) - console.log(storeData) + // console.log(storeData) storeDialogRef.value.open(JSON.parse(JSON.stringify(storeData))) } const lineList = ref([]) @@ -558,7 +580,7 @@ const getPositionMapListFun = async (positionMapId) => { item.imgUrl = formatteTypeImg(item.type) }) } - console.log(data) + // console.log(data) pointList.value = data // console.log(pointList.value) @@ -647,7 +669,7 @@ const linkWebSocket = (url) => { data: JSON.parse(data[key]) }) } - console.log('=====', dataList) + // console.log('=====', dataList) testCarList.value = dataList } }) @@ -663,10 +685,11 @@ const disconnect = () => { } //获取扫描图 const getMapData = async (item) => { - // console.log("============",item) + console.log('============', JSON.parse(item.yamlJson)) nowObject.value = JSON.parse(JSON.stringify(item)) + nowObject.value.showYamlJson = JSON.parse(item.yamlJson) let websoketUrl = `${replaceHttpWithWs(import.meta.env.VITE_BASE_URL)}/infra/ws?type=map&floor=${nowObject.value.floor}&area=${nowObject.value.area}` - console.log(websoketUrl) + // console.log(websoketUrl) linkWebSocket(websoketUrl) getPositionMapListFun(nowObject.value.id) emit('transmitMapInfo', { @@ -706,7 +729,7 @@ const computedRatio = () => { item.data.pose2d.y ]).top }) - console.log('当前数据', testCarList.value) + // console.log('当前数据', testCarList.value) } }) .catch((error) => { @@ -731,7 +754,7 @@ const computedRatio = () => { } }) getImageWidth(imgUrl.value, 'height').then((res) => { - console.log('高', res) + // console.log('高', res) heightVal.value = res }) // console.log(width) @@ -741,7 +764,7 @@ const computedRatio = () => { const getMapLineList = () => { MapApi.mapLineListGet({ positionMapId: nowObject.value.id }).then((res) => { - console.log(res) + // console.log(res) lineList.value = res }) } @@ -808,14 +831,14 @@ const getElementWidthByClass = (className) => { } //小车双击 const carDbClick = (item, index) => { - console.log(item) + // console.log(item) carDialogRef.value.open(JSON.parse(JSON.stringify(item))) } const boxLeft = ref(0) //获取元素距离左边的距离 const getLeftPx = () => { let indexpageContainer = document.getElementById('indexpage-container') - console.log('距离左边的距离', indexpageContainer.getBoundingClientRect().left) + // console.log('距离左边的距离', indexpageContainer.getBoundingClientRect().left) boxLeft.value = indexpageContainer.getBoundingClientRect().left + 6 } // 封装监听元素宽度变化的方法 diff --git a/src/views/mapPage/taskManagement/taskList.vue b/src/views/mapPage/taskManagement/taskList.vue index 34aa176a..51f73397 100644 --- a/src/views/mapPage/taskManagement/taskList.vue +++ b/src/views/mapPage/taskManagement/taskList.vue @@ -216,7 +216,7 @@ const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const { push } = useRouter() - +const route = useRoute(); const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 @@ -337,9 +337,22 @@ const robotList = ref([]) const getCanUseRobotList = async () => { robotList.value = await MapTaskAPi.getCanUseRobot() } - +// 匹配对应的值 +const findPropertyValue = (arr, targetValue, compareProp, returnProp) =>{ + for (let i = 0; i < arr.length; i++) { + if (arr[i][compareProp] === targetValue) { + return arr[i][returnProp]; + } + } + return undefined; +} /** 初始化 **/ onMounted(() => { + if(route.query.type){ + let data = getIntDictOptions(DICT_TYPE.ROBOT_TASK_STATUS) + queryParams.taskStatus = findPropertyValue(data, route.query.type, 'label', 'value') + + } getList() getCanUseRobotList() })