111

src/components/map/index.vue

@@ -357,27 +357,26 @@ export default {
     },
     initEvent() {
       let lastHoveredFeature = null;
-
-      function calculateHoverTop(mouseY, hoverHeight) {
-        const windowHeight = window.innerHeight;
+      const calculateHoverTop = (mouseY, hoverHeight) => {
+        const componentHeight = this.$el.clientHeight;
         const offset = 10;
-        if (mouseY + hoverHeight + offset > windowHeight) {
+        if (mouseY + hoverHeight + offset > componentHeight) {
           return mouseY - hoverHeight - offset;
         }
         return mouseY - hoverHeight / 2;
-      }
+      };
 
-      function calculateHoverLeft(mouseX, hoverWidth) {
-        const windowWidth = window.innerWidth;
+      const calculateHoverLeft = (mouseX, hoverWidth) => {
+        const componentWidth = this.$el.clientWidth;
         const offset = 10;
-        if (mouseX + hoverWidth + offset > windowWidth) {
+        if (mouseX + hoverWidth + offset > componentWidth) {
           return mouseX - hoverWidth - offset;
         }
         if (mouseX - hoverWidth - offset < 0) {
           return offset;
         }
         return mouseX + offset;
-      }
+      };
       this.map.on("pointermove", (evt) => {
         const features = this.map.getFeaturesAtPixel(evt.pixel, {
           hitTolerance: 1,
@@ -538,13 +537,13 @@ export default {
   padding: 0;
   z-index: 100;
   h3 {
-    background-color:var(--header-bg);
+    background-color: var(--header-bg);
     width: 240px;
     padding: 5px 10px;
     font-size: 16px;
   }
   div {
-    background-color:var(--content-bg);
+    background-color: var(--content-bg);
     width: 240px;
     font-size: 12px;
     p {
@@ -577,5 +576,4 @@ export default {
     }
   }
 }
-
 </style>

src/router/index.js

@@ -28,8 +28,8 @@ const createRouter = () =>
             iconName: "gps",
             component: () =>
               import(
-                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
-                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue"
+                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
+                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue"
               ),
           },
           {

src/views/home/Index.vue

@@ -56,7 +56,7 @@ export default {
   data() {
     return {
       loading: false,
-      isShowHd: true, //true 则展示华电的菜单样式，false 则展示默认的左侧边栏菜单
+      isShowHd: false, //true 则展示华电的菜单样式，false 则展示默认的左侧边栏菜单
     };
   },
   methods: {

src/views/ledger/milltype.vue

@@ -588,6 +588,7 @@ export default {
           this.onSubmit();
           this.$message.success(this.isEdit ? "编辑成功" : "新增成功");
           this.isEdit = false;
+          this.handleClose();
         }).catch((error) => {});
       });
     },

src/views/ledger/windsite.vue

@@ -114,7 +114,7 @@
           </template>
         </el-table-column>
 
-        <!-- <el-table-column
+        <el-table-column
           align="center"
           prop="contractNumber"
           label="合同功率曲线数"
@@ -125,7 +125,7 @@
               scope.row.contractNumber
             }}</el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
 
         <el-table-column
           prop="provinceName"