diff --git a/src/api/charts/index.ts b/src/api/charts/index.ts new file mode 100644 index 00000000..cb7c35a3 --- /dev/null +++ b/src/api/charts/index.ts @@ -0,0 +1,8 @@ +import request from '@/config/axios' + + + +//获取整体看板信息 +export const bulletinBoardGet = async (params) => { + return await request.get({ url: `/system/bulletinBoard/get`, params }) +} diff --git a/src/views/board/allBoard/index.vue b/src/views/board/allBoard/index.vue new file mode 100644 index 00000000..a02fa0ad --- /dev/null +++ b/src/views/board/allBoard/index.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/src/views/board/carBoard/createEditDialog.vue b/src/views/board/carBoard/createEditDialog.vue index 6b9d3ea0..3aafba99 100644 --- a/src/views/board/carBoard/createEditDialog.vue +++ b/src/views/board/carBoard/createEditDialog.vue @@ -14,10 +14,10 @@ - + 编辑 {{ - item.status == 0 ? '解锁' : '锁定' + item.robotTaskModel == 0 ? '解锁' : '锁定' }} 删除 diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue index 51c4759f..27a4c111 100644 --- a/src/views/mapPage/realTimeMap/components/indexPage.vue +++ b/src/views/mapPage/realTimeMap/components/indexPage.vue @@ -22,35 +22,23 @@
-
- - - - -
- +
+ + + + +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
+
@@ -366,7 +393,7 @@ const getCurvePath = (curve) => { let endPointX = (Number(curve.endPointX) + Number(curve.endWidth) / 2) * radio.value let endPointY = (Number(curve.endPointY) + Number(curve.endHigh) / 2) * radio.value - return `M ${startPointX} ${startPointY} C ${curve.beginControlX* radio.value} ${curve.beginControlY* radio.value}, ${curve.endControlX* radio.value} ${curve.endControlY* radio.value}, ${endPointX} ${endPointY}` + return `M ${startPointX} ${startPointY} C ${curve.beginControlX * radio.value} ${curve.beginControlY * radio.value}, ${curve.endControlX * radio.value} ${curve.endControlY * radio.value}, ${endPointX} ${endPointY}` } //放大缩小 const isSizeRaio = ref(1) @@ -610,6 +637,19 @@ const linkWebSocket = (url) => { // 监听消息 socketClient.value.onMessage((message) => { console.log('收到消息:', message) + if (message.type == 'map_push') { + let data = JSON.parse(testJson.content) + // console.log("============",data) + let dataList = [] + for (let key in data) { + dataList.push({ + macAddress: key, + data: JSON.parse(data[key]) + }) + } + console.log('=====', dataList) + testCarList.value = dataList + } }) } } diff --git a/src/views/statisticalView/index.vue b/src/views/statisticalView/index.vue index 35d22bb3..6c081024 100644 --- a/src/views/statisticalView/index.vue +++ b/src/views/statisticalView/index.vue @@ -49,7 +49,7 @@