commit

src/layout/Aside/index.vue

@@ -37,9 +37,7 @@
       <el-menu-item index="/home/dataManagement">
         <dv-decoration-11 style="width:200px;height:60px;">数据管理显控</dv-decoration-11>
       </el-menu-item>
-
     </el-menu>
-    
   </el-aside>
 </template>
 <script>

src/layout/Main/index.vue

@@ -85,6 +85,7 @@ export default {
     overflow: hidden;
     display: flex;
     color: white !important;
+    height: calc(100vh - 130px);
 }
 .left-container{
   width: 100%;
@@ -121,6 +122,7 @@ export default {
   background: transparent !important;
   border: none;
   color: white;
+  height: 100%;
 }
 /deep/ .el-table{
   background: transparent !important;
@@ -170,12 +172,19 @@ background-color: #212e3e !important;
 
   background-color: rgba(6,30,93,.5);
   padding: 0 !important;
+  height: calc(100% - 28px);
 }
+
+/deep/ .el-card__body .el-table{
+
+height: 100%;
+}
+
 /deep/ .el-card__header {
   background-color: #1981f6;
   color: white;
-  height: 20px;
-  line-height: 5px;
+  height: 28px;
+  padding: 0px 20px;
 }
 
 

src/views/intelESMProcess/index.vue

@@ -169,7 +169,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 /* .text {
   font-size: 14px;
 }

src/views/radarInvestigation/index.vue

@@ -1,10 +1,9 @@
 <template>
     <div style="height:100%;">
-        <el-row style="height:70%;" gutter="20">
+        <el-row style="height:65%;" gutter="20">
 
-            <el-col :span="6">
-
-                <el-row>
+            <el-col :span="6" style="height:100%">
+                <el-row style="height: 28px;">
                     <span class="select">
                             <span style="width:40%;text-align: center;">当前传感器：</span>
                             <el-select style="width:60%;" v-model="currentSensor" placeholder="选择传感器" @change="instanceChange" size="mini">
@@ -15,7 +14,7 @@
                     </span>
                     
                 </el-row>
-                <el-row>
+                <el-row style="height: calc(100% - 28px);">
                     <el-card class="tableHeight">
                         <div slot="header" class="clearfix">
                             <span>工作参数</span>
@@ -35,17 +34,17 @@
                     </el-card>
                 </el-row>
             </el-col>
-            <el-col :span="12" style="height:50%;">
+            <el-col :span="12" style="height:100%;">
                 <el-card class="radar">
                     <div slot="header" class="clearfix">
                         <span>雷侦状态显示</span>
                     </div>
                     <div class="echarts-box">
-                        <div id="radarEchart" class="mapecharts"></div>
+                        <div id="radarEchart" ></div>
                     </div>
                 </el-card>
             </el-col>
-            <el-col :span="6" style="height:50%;">
+            <el-col :span="6" style="height:100%;">
                 <el-card class="tableHeight">
                     <div slot="header" class="clearfix">
                         <span>实例状态表</span>
@@ -58,12 +57,13 @@
                 </el-card>
             </el-col>
         </el-row>
-        <el-row style="height:30%;">
-            <el-card>
+        <el-row style="height:35%;">
+            <el-card class="target">
                 <div slot="header" class="clearfix">
                     <span>雷侦目标列表</span>
+                    <el-button style="float: right;" round size="mini">发送到协同平台</el-button>
                 </div>
-                <el-table :data="ESMresults" style="width: 100%;" max-height="200">
+                <el-table :data="ESMresults" class="targetTable" height="100%;">
                     <!-- <el-table-column prop="az" label="方位角" width="150">
                     </el-table-column> -->
                     <el-table-column prop="az" label="方位角(°)">
@@ -84,9 +84,6 @@
                     </el-table-column>
                 </el-table>
             </el-card>
-            <div>
-                <el-button>发送到协同平台</el-button>
-            </div>
         </el-row>
     </div>
 </template>
@@ -265,9 +262,9 @@ export default {
         //通过窗体高宽计算容器高宽，渲染echart图表的div的宽高度以达到自适应目的
         resizeDom() {
             console.log("高度自适应")
-            // const boxHeight = document.getElementsByClassName("echarts-box")[0].clientHeight
-            // var Echart = document.getElementById('radarEchart')
-            // Echart.style.height = (boxHeight/2-65)+'px';
+            const boxHeight = document.getElementsByClassName("echarts-box")[0].clientHeight
+            var Echart = document.getElementById('radarEchart')
+            Echart.style.height = (boxHeight-65)+'px';
             this.$echarts.init(document.getElementById('radarEchart')).resize()
         },
         instanceChange(val) {
@@ -293,20 +290,15 @@ export default {
     width: 100%;
 }
 
-.mapecharts {
-    height: 100%;
-}
 
 .radar {
     height: 100%;
 }
 
-.radar /deep/ .el-card__body {
-    height: calc(100% - 100px);
-
-}
 
 .select{
    display: flex;
 }
+
+
 </style>