From 17d785069fca0acc9586c54e769792704abca4cd Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 28 Mar 2024 09:49:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=99=BA=E8=83=BD?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=E6=9C=BA=E6=A2=B0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=B2=BE=E5=87=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 32 +++- src/styles/reset.scss | 15 +- .../equipmentPosition/index.vue | 19 ++- .../smartSafeHat/index.vue | 139 ++++++++++++------ src/views/sevenLargeScreen/indexL_syhy.vue | 6 +- 5 files changed, 158 insertions(+), 53 deletions(-) diff --git a/index.html b/index.html index 531b808..71d8da5 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ <%- title %> - +
@@ -91,6 +93,7 @@
+ + diff --git a/src/styles/reset.scss b/src/styles/reset.scss index b49409a..9375a6f 100644 --- a/src/styles/reset.scss +++ b/src/styles/reset.scss @@ -136,7 +136,20 @@ body, margin: 0; font-family: siyuan; } - +// body, html{ +// width: 100%; +// height: 100%; +// position: relative; +// overflow: hidden; +// } +// #app { +// width: 1920px; +// height: 1080px; +// position: fixed; +// left: 50%; +// top: 50%; +// transform: translate(-50%, -50%); +// } /* 解决 h1 标签在 webkit 内核浏览器中文字大小失效问题 */ :-webkit-any(article, aside, nav, section) h1 { font-size: 2em; diff --git a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue index ce9d3d7..166dff1 100644 --- a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue +++ b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue @@ -109,7 +109,7 @@
-
+
@@ -338,6 +338,8 @@ let isIndeterminateFence = ref(true); let checked = ref(1); let devName = ref(""); let locationList = ref([]); +let ratio:any = ref(sessionStorage.getItem('ratio')) +ratio.value = 1/Number(ratio.value) let addFormRef = ref(); let addForm = ref({ areaRadius: 100, //区域半径 @@ -1112,9 +1114,10 @@ function trackMapInit(path: any, item: any) { content: info.join("") //使用默认信息窗体框样式，显示信息内容 }); infoWindow.open(map, e.target.getPosition()); + map.setFitView(); } - map.setFitView(); + } function startAnimation() { marker.moveAlong(lineArr, 200); @@ -1125,7 +1128,8 @@ function initMap() { var that = this; //地图加载 map = new AMap.Map("mapContainer", { - resizeEnable: true + // viewMode: '3D', + resizeEnable: true, }); var geocoder = new AMap.Geocoder({}); //输入提示 @@ -1487,8 +1491,9 @@ function echoPersonMarker(item) { }); infoWindow.open(map, e.target.getPosition()); + map.setFitView(); } - map.setFitView(); + } @@ -1505,9 +1510,9 @@ function echoPersonMarker(item) {