Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

src/components/screenDisplay.vue

@@ -318,7 +318,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
       <video
         id="video"
         type="video/mp4"
-        src="/video/video6487e9f1b9652.mp4"
+        src="/video/GYBoiler3D.mp4"
         width="1280"
         controls
         muted
@@ -520,7 +520,7 @@ export default defineComponent({
             '<div class="custom-content-marker markerPoints" id="' +
             markerId +
             '">' +
-            '   <img src="/images/points1.png">' +
+            '   <img src="/imgs/Gis/points1.png">' +
             "</div>";
           break;
         case 2:
@@ -529,7 +529,7 @@ export default defineComponent({
             '<div class="custom-content-marker markerPoints" id="' +
             markerId +
             '">' +
-            '   <img src="/images/points2.png">' +
+            '   <img src="/imgs/Gis/points2.png">' +
             "</div>";
           break;
         case 3:
@@ -538,7 +538,7 @@ export default defineComponent({
             '<div class="custom-content-marker markerPoints" id="' +
             markerId +
             '">' +
-            '   <img src="/images/points3.png">' +
+            '   <img src="/imgs/Gis/points3.png">' +
             "</div>";
           break;
       }
@@ -1552,7 +1552,7 @@ export default defineComponent({
   width: 95%;
   height: 35px;
   margin: 4% 0 0 5%;
-  background: url("/images/title_bg.png") top left no-repeat;
+  background: url("/imgs/Gis/title_bg.png") top left no-repeat;
 }
 .titleStyle p {
   padding: 1% 5% 0 5%;
@@ -1616,12 +1616,12 @@ export default defineComponent({
   font-weight: bolder;
 }
 .btnGroup .btn1 {
-  background: url("/images/icon_btn1.png") center center no-repeat;
+  background: url("/imgs/Gis/icon_btn1.png") center center no-repeat;
   color: #ffffff;
   margin-bottom: 10px;
 }
 .btnGroup .btn2 {
-  background: url("/images/icon_btn2.png") center center no-repeat;
+  background: url("/imgs/Gis/icon_btn2.png") center center no-repeat;
   color: #000000;
 }
 .jkBarBlock {

src/views/Gis/screenDisplay.vue

@@ -6,11 +6,14 @@ const m = detectZoom();
 if( window.screen.height * window.devicePixelRatio == 1080) {
     document.body.style.zoom = 100 / Number(m);
 }
-var height = window.screen.height;
-console.log(height);
-if( window.screen.height * window.devicePixelRatio >= 1600) {
-  document.body.style.zoom = 132 / Number(m);
-}
+
+// if (window.screen.width * window.devicePixelRatio >= 3840) {
+//   document.body.style.zoom = 100 / (Number(m) / 2)
+// } else if (window.screen.width * window.devicePixelRatio >= 2560 && window.screen.width * window.devicePixelRatio <= 3840) {
+//   document.body.style.zoom = 100 / (Number(m) / 1.33)
+// } else {
+//   document.body.style.zoom = 100 / Number(m)
+// }
 </script>
 
 <template>

src/views/home.vue

@@ -20,10 +20,10 @@
         <div class="ams-container" :style="{ left: menuWidth - 2 + 'px' }">
             <div class="ams-header" style="    background-color: rgb(31, 63, 141);">
                 <div class="enterprise-name">
-                    <el-dropdown size="'large'" style="margin-left: 10px;margin-top: 5px;color:blue; width: 100%;"
+                    <el-dropdown size="'large'" style=" margin-left: 10px;margin-top: 5px;color:blue; width: 100%;"
                         @command="handleCommand" :trigger="(roleId > 2) ? 'contextmenu' : 'hover'">
                         <span class="el-dropdown-link">
-                            <el-image style=" height: 60px " :src="currLogoUrl" :fit="'full'" />
+                            <el-image style=" height: 50px " :src="currLogoUrl" :fit="'full'" />
                         </span>
                         <template #dropdown>
                             <el-dropdown-menu>
@@ -479,7 +479,7 @@ export default defineComponent({
                 showWeatherData.supplyData.supplyId = enterpriseList.value[0].supplyList[0].supplyId;
                 showWeatherData.supplyData.supplyName = enterpriseList.value[0].supplyList[0].supplyName;
             }
-            currLogoUrl = new URL('../assets/imgs/home/' + enterpriseList.value[0].logo, import.meta.url).href;
+            currLogoUrl = new URL('/imgs/home/' + enterpriseList.value[0].logo, import.meta.url).href;
             //console.log(currLogoUrl);
 
             await getWeather();
@@ -518,7 +518,7 @@ export default defineComponent({
     }
 
     function openMap(){
-        const routePath = '/iframe'; // 要导航到的路由路径
+        const routePath = '/GisHome'; // 要导航到的路由路径
       // 打开新窗口并导航到指定路由
         window.open(
             `${routePath}`,

src/views/html.vue

+<template>
+  <div class="div"></div>
+</template>
+<style scoped>
+.div {
+    width: 98%;
+    height: 95vh;
+    margin: 1%;
+    background-color: aquamarine;
+    border: 1px solid black;
+}
+</style>
\ No newline at end of file