修复bug7-1am

src/views/admin/cockpitManage/Index.vue

@@ -126,12 +126,11 @@ export default {
       const processedData = this.processTreeData(treedata);
       this.parentOpt = processedData;
       this.defaultdata = res.data[0];
-      this.parentChange(  this.defaultdata);
+      this.parentChange(this.defaultdata);
       // const firstLayer = this.findFirstFieldLayer(processedData);
       // if (firstLayer) {
       //   this.parentChange(  this.defaultdata);
-    // }
-    
+      // }
     },
     //过滤数据
     processTreeData(treeData) {
@@ -242,7 +241,8 @@ export default {
 .map-ditu {
   // min-width: 86.9vw;
   // max-width: 94.9vw;
-  height: 93vh;
+  // height: 93vh;
+  height: 100%;
   position: relative;
 }
 

src/views/admin/cockpitManage/component/rightdata copy.vue

@@ -59,7 +59,7 @@
           <dv-scroll-board
             :config="JQconfig"
             @mouseover="over"
-            style="width: 260px; height: 150px ;"
+            style="width: 260px; height: 150px"
           />
           <p
             v-if="ifShow"
@@ -117,7 +117,7 @@ export default {
         headerBGC: "#004F5F",
         oddRowBGC: "#004F5F",
         evenRowBGC: "#028A8A",
-        columnWidth:[65]
+        columnWidth: [65],
       },
       dvText: {
         name: "",
@@ -217,13 +217,13 @@ export default {
 };
 </script>
 
-
 <style lang="scss" scoped>
 .backbone {
   width: 300px;
   color: #fff;
   background: #008080;
-  height: 95%;
+  // height: 100%;
+  // height: 95%;
   border-radius: 5px;
   padding: 20px;
 }
@@ -325,7 +325,7 @@ export default {
   top: 0;
 }
 
-.dv-scroll-board{
-    font-size: 12px;
+.dv-scroll-board {
+  font-size: 12px;
 }
-</style>
+</style>

src/views/admin/cockpitManage/component/rightdata.vue

@@ -9,7 +9,9 @@
       <div class="BOX">
         <div style="display: flex">
           <div class="YC01">
-            <strong> {{ equipment?.errCounrt ? equipment.errCounrt : 0 }}</strong>
+            <strong>
+              {{ equipment?.errCounrt ? equipment.errCounrt : 0 }}</strong
+            >
             <span>异常总数</span>
           </div>
           <div class="YC02">
@@ -219,7 +221,8 @@ export default {
   width: 300px;
   color: #fff;
   background: #008080;
-  height: 95%;
+  // height: 100%;
+  // height: 95%;
   border-radius: 5px;
   padding: 20px;
 }

src/views/home/Index.vue

@@ -4,7 +4,7 @@
       <Menu></Menu>
       <el-main>
         <HeaderCom @setLoding="setLoding"></HeaderCom>
-        <MenuTag></MenuTag>
+        <!-- <MenuTag></MenuTag> -->
         <!-- 主体内容-->
         <!-- <el-scrollbar>
           <ul>
@@ -12,7 +12,7 @@
           </ul>
         </el-scrollbar> -->
         <transition name="slide-fade">
-          <div class="">
+          <div class="main-content">
             <router-view />
           </div>
         </transition>
@@ -59,8 +59,12 @@ export default {
   }
   .el-main {
     min-width: 800px;
+    height: 100%;
     background-color: #f7f7f8;
     padding: 0;
+    .main-content {
+      height: 100%;
+    }
   }
 }
 

src/views/performance/assetssMag.vue

@@ -57,7 +57,7 @@
               v-if="scope.row.analysisState == 0"
               :text-inside="true"
               :stroke-width="20"
-              :percentage="scope.row.analysisProgress"
+              :percentage="30"
               :class="{
                 'indeterminate-progress': scope.row.analysisProgress < 100,
                 'animated-progress': true,