From d2ab5b10761d82eb5ec6af3a935b8f8269cf1d25 Mon Sep 17 00:00:00 2001
From: little4 <360013221@qq.com>
Date: Mon, 14 Oct 2024 20:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/HeaderMenu/CustomMenu.vue | 12 ++++++------
.../pages/Home/components/RoadAndEvents/utils/map.js | 1 +
.../analysis/components/deviceSummary/index.vue | 4 ++++
.../publicService/components/record/index.vue | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
index 8024dc6f..01278079 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
@@ -99,12 +99,12 @@ export default {
// window.open(response.msg===''?'https://10.0.86.63:9000/s?loadType=auto&group=15ai1k13748d&runType=box':response.msg);
// })
// }
- // else if(node.title==='GIS+BIM可视化'){
- // this.activeIndex = key
- // getConfigKey("dc.gisAndBim").then((response) => {
- // window.open(response.msg===''?'https://10.0.86.63:9000/s?loadType=auto&group=15ai1k13748d&runType=box':response.msg);
- // })
- // }
+ else if(node.title==='GIS+BIM可视化'){
+ this.activeIndex = key
+ getConfigKey("dc.gisAndBim").then((response) => {
+ window.open(response.msg===''?'https://10.0.86.63:9000/s?loadType=auto&group=15ai1k13748d&runType=box':response.msg);
+ })
+ }
else if (this.$route.path != node.path){
this.$router.push(node.path);
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 184417f8..6d28e1b8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -158,6 +158,7 @@ export class MarkerCluster {
'jhlayers', // 当前添加的数据 唯一标识(删除该图层时也会用到)//./事件专题/交通事故.svg
true // 当前新加图层是否启用聚合效果
);
+ console.log(aryPoints,'点位数组')
}
if(Vue.prototype.isMapStatck){
Vue.prototype.mapIns.pileIsShow("jhlayers", true);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue
index 35c4292c..883ae52f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue
@@ -35,6 +35,10 @@
src="@screen/images/layer/路测设备/情报板.svg"
v-if="item.title.includes('门架式可变信息标志')"
/>
+
- {{ (scope.row.operIp === 'unknown' || !scope.row.operIp) ? '服务器': scope.row.operIp}}
+ {{ (scope.row.ip === 'unknown' || !scope.row.ip) ? '服务器': scope.row.ip}}