From 719a6a7d07a6c1cb7a569f6fbbf5a0dca8d40df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 3 Mar 2022 16:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue | 4 +++-
 src/views/xm/core/xmQuestion/XmQuestionMng.vue         | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index 4b51ecc2..88ab9fe1 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -7,7 +7,7 @@
  					<el-button @click="groupRoleDescVisible=true" icon="el-icon-document">角色说明</el-button> 
 					 <font color="red">注意：点击架构图进行操作</font>
   		</el-row> 
-		<el-row class="">
+		<el-row ref="table" :style="{overflowX:'auto',height:maxTableHeight+'px'}">
 			<vue-okr-tree :data="okrTreeData" v-loading="load.list"
 				show-collapsable   
 				node-key="id"
@@ -738,6 +738,8 @@ XmProductSelect,
 		mounted() {
 			this.$nextTick(() => {
 			    //initSimpleDicts('all',['sex','gradeLvl']).then(res=>this.dicts=res.data.data);
+				
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
 			    this.initData()
 				this.searchXmProjectGroups(); 
 
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 9b6d9d36..9bbae32a 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -124,7 +124,7 @@
 			 </el-row> 
 			 <el-row class="padding-top">
 				<!--列表 XmQuestion xm_question-->
-				<el-table  ref="table" :height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table  ref="table" :height="maxTableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  					<el-table-column prop="name" label="缺陷名称"  min-width="150">
 						<template slot-scope="scope"> 
 								<el-link @click="showEdit(scope.row)" type="primary"> 
@@ -298,7 +298,7 @@
 				selectProjectVisible:false,
 				productSelectVisible:false,
 				nextAction:'',
-				tableHeight:300,
+				maxTableHeight:300,
 				cloumns: [
 					{
 						key: 'name',
@@ -943,7 +943,7 @@
 			this.$nextTick(() => {
 				
 				
-				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmQuestions();
 			});
 				listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{