From 0457295b485951dc2a9d06a888f21f900436f1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 3 Jul 2021 14:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                               |  4 ++--
 .../core/xmProjectPhase/XmProjectPhaseMng.vue | 16 +--------------
 .../xmProjectPhase/XmProjectPhaseSelect.vue   | 18 ++---------------
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue        | 20 +++----------------
 src/views/xm/core/xmTask/XmTaskMngBatch.vue   | 14 -------------
 .../xm/core/xmTestCase/XmTestCaseMng.vue      | 12 +++++------
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue |  8 ++++----
 8 files changed, 19 insertions(+), 75 deletions(-)

diff --git a/config/index.js b/config/index.js
index 1c5ff7ae..54b75a90 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,7 +11,7 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: { 
-      
+      /**  
     	'/api/m1/xm': {
             target: 'http://localhost:7067',
             changeOrigin: true,
@@ -19,7 +19,7 @@ module.exports = {
                 '^/api/m1/xm': '/xm'
               }
           }, 
-      /**    
+        
     	'/api/m1/workflow': {
             target: 'http://localhost:7080',
             changeOrigin: true,
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 3c9232f4..1101ba9e 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -1308,19 +1308,5 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 
 </script>
 
-<style lang="scss" scoped>
- .el-table{ 
-	 box-sizing: border-box; 
-	/deep/ .cell {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: normal;
-    word-break: break-all;
-    line-height: 23px;
-    padding-right: 10px;
-	display: flex;
-	 }
-}
+<style lang="scss" scoped> 
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index ec2c3e95..20d2dd71 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -2,7 +2,7 @@
 	<section>  
 		<el-row>
 		<el-table :max-height="tableHeight" ref="selectPhaseTable" :data="projectPhaseTreeData"    :show-summary="false"  row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
- 			<el-table-column prop="phaseName" label="阶段名称" min-width="160" > 
+ 			<el-table-column prop="phaseName" label="阶段名称" min-width="160" show-overflow-tooltip> 
 				 <template slot="header" slot-scope="scope">
 					<div>阶段  <el-tag size="mini" v-if="editForm.id" closable @close="clearSelectPhase()"> {{editForm.phaseName}}</el-tag></div>
 				</template>
@@ -435,19 +435,5 @@
 
 </script>
 
-<style lang="scss" scoped>
- .el-table{ 
-	 box-sizing: border-box; 
-	/deep/ .cell {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: normal;
-    word-break: break-all;
-    line-height: 23px;
-    padding-right: 10px;
-	display: flex;
-	 }
-}
+<style lang="scss" scoped> 
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 09554a1d..fa20e603 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -110,7 +110,7 @@
 				<!--列表 XmQuestion xm_question-->
 				<el-table ref="table" :max-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-column sortable type="index" width="45"></el-table-column> 
-					<el-table-column prop="name" label="问题名称"  min-width="200"> 
+					<el-table-column prop="name" label="问题名称"  min-width="200" show-overflow-tooltip> 
 						<template slot-scope="scope">
 							{{scope.row.id}}&nbsp;<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.name}}</el-link> 
 						</template>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 59b741b3..178756df 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -140,11 +140,11 @@
 							>
 							<el-table-column sortable prop="name" label="任务名称(点击详情)"  min-width="240" show-overflow-tooltip>
 								<template slot-scope="scope">
-									{{scope.row.sortLevel}}&nbsp;<el-link  type="primary"  @click.stop="showDrawer(scope.row)">{{scope.row.name}}</el-link>
+									<span>{{scope.row.sortLevel}}&nbsp;<el-link  type="primary"  @click.stop="showDrawer(scope.row)">{{scope.row.name}}</el-link></span>
 
 								</template>
 							</el-table-column>
-							<el-table-column v-if=" !selProject || !selProject.id" prop="projectName" label="项目"  min-width="120">
+							<el-table-column v-if=" !selProject || !selProject.id" prop="projectName" label="项目"  min-width="120" show-overflow-tooltip>
 
 								<template slot="header">
 									项目<el-button @click="showProjectList"  icon="el-icon-search" circle size="mini"></el-button>
@@ -153,7 +153,7 @@
 									{{scope.row.projectName}}
 								</template>
 							</el-table-column>
-							<el-table-column  prop="menuId" label="故事"  min-width="120">
+							<el-table-column  prop="menuId" label="故事"  min-width="120" show-overflow-tooltip>
 								<template slot="header">
 									故事<el-button @click="showMenuStory"  icon="el-icon-search" circle size="mini"></el-button>
 								</template>
@@ -1907,18 +1907,4 @@ small{
 }
 </style>
 <style lang="scss" scoped>
- .el-table{
-	 box-sizing: border-box;
-	/deep/ .cell {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: normal;
-    word-break: break-all;
-    line-height: 23px;
-    padding-right: 10px;
-	display: flex;
-	 }
-}
 </style>
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index 572c085d..7f09ea7b 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -1402,18 +1402,4 @@ small{
 }
 </style>
 <style lang="scss" scoped>
- .el-table{ 
-	 box-sizing: border-box; 
-	/deep/ .cell {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: normal;
-    word-break: break-all;
-    line-height: 23px;
-    padding-right: 10px;
-	display: flex;
-	 }
-}
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 6fe2b62e..74f21c7a 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -71,20 +71,20 @@
 			<el-table ref="table" :max-height="tableHeight" :data="xmTestCases" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45"></el-table-column>
-				<el-table-column prop="caseName" label="标题" min-width="100" >
+				<el-table-column prop="caseName" label="标题" min-width="100" show-overflow-tooltip>
 					<template scope="scope">
 						{{scope.row.id}}&nbsp;&nbsp;<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.caseName}}</el-link>
 					</template>
 				</el-table-column>
- 				<el-table-column prop="caseRemark" label="备注" min-width="80" ></el-table-column> 
- 				<el-table-column  prop="menuName" label="故事名" min-width="80" > 
+ 				<el-table-column prop="caseRemark" label="备注" min-width="80" show-overflow-tooltip></el-table-column> 
+ 				<el-table-column  prop="menuName" label="故事名" min-width="80" show-overflow-tooltip> 
 					<template slot="header">
 						故事<el-button @click="showMenu"  icon="el-icon-search" circle size="mini"></el-button>
  					</template>
 				 </el-table-column>
-				<el-table-column v-if="!multiSelect" prop="ctime" label="创建时间" min-width="80" ></el-table-column>
-				<el-table-column v-if="!multiSelect" prop="lusername" label="更新人姓名" min-width="80" ></el-table-column>
- 				<el-table-column v-if="!multiSelect" prop="moduleName" label="模块名称" min-width="80" ></el-table-column>
+				<el-table-column v-if="!multiSelect" prop="ctime" label="创建时间" min-width="80" show-overflow-tooltip></el-table-column>
+				<el-table-column v-if="!multiSelect" prop="lusername" label="更新人姓名" min-width="80" show-overflow-tooltip></el-table-column>
+ 				<el-table-column v-if="!multiSelect" prop="moduleName" label="模块名称" min-width="80" show-overflow-tooltip></el-table-column>
 				<el-table-column v-if="!multiSelect" prop="caseStatus" label="用例状态" min-width="80" >
 					<template scope="scope">
 						<el-tag :type="scope.row.caseStatus=='1'?'success':'warning'">{{scope.row.caseStatus=="1"?"正常":"作废"}}</el-tag>
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 5e7bc8a6..01017736 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -81,7 +81,7 @@
 			<el-table ref="table"  :max-height="tableHeight" v-if="!gstcVisible" :data="xmTestCaseExecs" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45"></el-table-column>
- 				<el-table-column prop="projectName" label="项目名称" min-width="100" >
+ 				<el-table-column prop="projectName" label="项目名称" min-width="100" show-overflow-tooltip>
 					<template slot="header" v-if="!selProject">
 						项目<el-button @click="showProjectList"  icon="el-icon-search" circle size="mini"></el-button>
  					</template>
@@ -91,20 +91,20 @@
 						{{scope.row.caseId}}&nbsp;<el-link type="primary" @click="showCaseDetail(scope.row)">{{scope.row.caseName}}</el-link>
 					</template>
 				</el-table-column>
-				<el-table-column prop="menuName" label="故事" min-width="100" >
+				<el-table-column prop="menuName" label="故事" min-width="100" show-overflow-tooltip>
 					<template slot="header" slot-scope="scope">
 						故事<el-button @click="showMenu"  icon="el-icon-search" circle size="mini"></el-button>
  					</template>
 
 				</el-table-column>
 				
-				<el-table-column prop="taskName" label="任务" min-width="100" >
+				<el-table-column prop="taskName" label="任务" min-width="100" show-overflow-tooltip>
 					<template slot-scope="scope">  
 						{{scope.row.taskName?scope.row.taskName:'未关联任务'}}
 						<el-button  v-if=" batchEditVisible==true "   type="warning"   @click="showSelectTask(scope.row)">选任务</el-button>  
 					</template>
 				</el-table-column> 
-				<el-table-column prop="execUsername" label="执行人姓名" min-width="100" >
+				<el-table-column prop="execUsername" label="执行人姓名" min-width="100" show-overflow-tooltip>
 					<template slot-scope="scope">  
 						{{scope.row.execUsername?scope.row.execUsername:'未设置'}}
 						<el-button  v-if=" batchEditVisible==true "   type="warning"   @click="showGroupUsers(scope.row)">选人</el-button>