From b89c7f68a245020903fd972b753c3de4f4a38147 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 25 Aug 2020 16:51:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=90=E5=88=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85table=E7=9A=84=E6=9C=80=E5=A4=A7=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                                  | 4 ++--
 src/views/modules/result/record/recorddetail.vue | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/index.js b/config/index.js
index 29525d6..72e858a 100644
--- a/config/index.js
+++ b/config/index.js
@@ -13,14 +13,14 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/lz_management': {
-        target: 'http://192.168.43.94:8080',
+        target: 'http://localhost:8080',
         changeOrigin: true
       }
     },
 
     // Various Dev Server settings
     // host: '192.168.43.94', // can be overwritten by process.env.HOST
-    host: '192.168.43.94', // can be overwritten by process.env.HOST
+    host: IP, // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue
index 700ad77..520ddd6 100644
--- a/src/views/modules/result/record/recorddetail.vue
+++ b/src/views/modules/result/record/recorddetail.vue
@@ -53,6 +53,7 @@
         :data="tableData"
         :span-method="objectSpanMethod"
         :cell-style="cellStyle"
+        :max-height="clientHeight"
         v-loading.body="loading"
         element-loading-text="Loading" border fit highlight-current-row>
         <el-table-column label="考核维度" prop="checkRange" align="center" width="80"></el-table-column>
@@ -63,7 +64,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="关键结果" prop="keyResult"  width="800" align="left">
+        <el-table-column label="关键结果" prop="keyResult" width="800" align="left">
           <template slot-scope="scope">
             <div v-html="scope.row.keyResult"  class="rich">
             </div>
@@ -118,6 +119,9 @@ import ApprovalAddOrUpdate from './approval-add-or-update.vue'
 
 export default {
   created () {
+    console.log(window.innerHeight)
+    this.clientHeight = window.innerHeight - 273
+    console.log(this.clientHeight)
   },
   filters: {
     getcheckWeightStr (val) {
@@ -159,7 +163,8 @@ export default {
       approvalVisible: false,
       loading: false,
       auth: [],
-      recordType: 0
+      recordType: 0,
+      clientHeight: 0
     }
   },
   components: {