Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/components/tablecmt/tablecmt.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="maboxhi">
+  <div class="maboxhi" id="bodys">
     <el-table
       :data="tableData"
       style="width: 100%"
@@ -190,7 +190,26 @@ const selecttable = ref(null);
  * selectCheck:下拉框选中事件
  * selection:勾选框事件
  */
+onMounted(()=>{
+    function getWinHight(){
+      var windowHight=0;
+      if(document.body.clientHeight&&document.documentElement.clientHeight){
+        windowHight=(document.body.clientHeight<document.documentElement.clientHeight)?document.body.clientHeight:document.documentElement.clientHeight;
 
+      }
+      else{
+        // windowHight=(document.body.clientHeight>document.documentElement.clientHeight)?document.body.clientHeight:document.documentElement.clientHeight;
+      }
+      // return windowHight;
+      return document.documentElement.clientHeight;
+    
+    }
+    // alert(getWinHight());
+
+   var bodyContent=document.getElementById('bodys');
+    bodyContent.setAttribute("style","height.500px");
+   
+})
 interface TableColumnType {
   /** 表格列的key */
   prop: string;
@@ -519,6 +538,7 @@ function copyContent(content: string) {
     return copyResult;
   }
 }
+
 </script>
 <style lang="scss" scope>
 // :root{
@@ -539,7 +559,8 @@ function copyContent(content: string) {
 // }
 .maboxhi {
   width: 100%;
-  height: calc(100vh - 350px);
+  min-height: 950px;
+  // height: 841px;
   // flex:1;
   // min-height: 100%;
 }