From 80aedb0605096290979b9b05d75518c5b2688c3f 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 15:38:15 +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/mdp/arc/tag/TagMng.vue               |  6 ++++--
 src/views/xm/core/skill/skillMng.vue           | 18 +++++++++---------
 .../xmProjectGroup/XmProjectGroupSelect.vue    |  8 ++++++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/views/mdp/arc/tag/TagMng.vue b/src/views/mdp/arc/tag/TagMng.vue
index 3f585e0c..465901bf 100644
--- a/src/views/mdp/arc/tag/TagMng.vue
+++ b/src/views/mdp/arc/tag/TagMng.vue
@@ -42,7 +42,7 @@
         </el-col> 
       </el-row>
     </el-row>
-    <el-row class="page-height-75 overflow-y-auto" v-if="editVisible==false"   ref="table">
+    <el-row class="page-height-70 overflow-auto" v-if="editVisible==false"   ref="table">
       <el-row v-for="(item,index) in convertTags" :key="item.categoryId" class="padding">
         <h3>
           <div>
@@ -61,7 +61,7 @@
         </el-col>
       </el-row>
     </el-row>
-    <el-row class="page-height-75 overflow-auto" v-else  ref="table">
+    <el-row class="page-height-70 overflow-auto" v-else  ref="table">
       <el-row v-for="(item,index) in convertTags" :key="item.categoryId" class="padding">
         <h3>
           <div>
@@ -660,6 +660,7 @@
 <style scoped>
 .copyButton {
   margin-left: 5px;
+  margin-top:2px;
   border-radius: 20px;
   padding: 10px 1px;
   border: 1px solid rgb(220, 223, 230);
@@ -676,6 +677,7 @@
 .checkCopyButton {
   /*color: #fff;*/
   margin-left: 5px;
+  margin-top:2px;
   border-radius: 20px;
   padding: 10px 1px;
   border: 1px solid #ffa00a;
diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue
index a7cdad05..bcc9e06f 100644
--- a/src/views/xm/core/skill/skillMng.vue
+++ b/src/views/xm/core/skill/skillMng.vue
@@ -42,12 +42,12 @@
         </el-col> 
       </el-row>
     </el-row>
-    <el-row class="app-container page-height-80 overflow-auto" v-if="editVisible==false">
-      <el-row v-for="(item,index) in convertSkills" :key="item.categoryId" class="padding">
+    <el-row class="app-container page-height-70 overflow-auto" v-if="editVisible==false">
+      <el-row v-for="(item,index) in convertSkills" :key="item.categoryId" class="padding"> 
         <h3>
           <div>
             {{item.categoryName+(item.pubc=='1'?'(公共)':'')}} 
-          </div>
+          </div> 
         </h3>
         <el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
           <div
@@ -61,17 +61,15 @@
         </el-col>
       </el-row>
     </el-row>
-    <el-row class="app-container page-height-80  overflow-auto" v-else>
-      <el-row v-for="(item,index) in convertSkills" :key="item.categoryId" class="padding">
-        <h3>
+    <el-row class="app-container page-height-70  overflow-auto" v-else>
+      <el-row v-for="(item,index) in convertSkills" :key="item.categoryId" class="padding"> 
           <div>
             {{item.categoryName+(item.pubc=='1'?'(公共)':'')}}
             <i
               class="el-icon-close closeStyle"
               @click.stop="delTagCategoryMethod(item.categoryId,index)"
             ></i>:
-          </div>
-        </h3>
+          </div> 
         <el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
           <div
             :class="'copyButton'"
@@ -479,6 +477,7 @@ export default {
 <style scoped>
 .copyButton {
   margin-left: 5px;
+  margin-top:2px;
   border-radius: 20px;
   padding: 10px 1px;
   border: 1px solid rgb(220, 223, 230);
@@ -495,8 +494,9 @@ export default {
 .checkCopyButton {
   /*color: #fff;*/
   margin-left: 5px;
+  margin-top:2px;
   border-radius: 20px;
-  padding: 10px 1px;
+  padding: 2px 1px;
   border: 1px solid #ffa00a;
   /*background-color: rgba(230, 162, 60, .1);*/
   /* background-color: #f9f9f9; */
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
index f75362c8..1c2b42a7 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
@@ -15,9 +15,11 @@
 		</el-row>  
 		<el-row class="page-height-70 padding-top" v-loading="load.list">
 			<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index"> 
-					<div class="padding-top"> <font color="#ccc">{{item.groupName + "："}} </font>
+				<h3>
+					<div class="padding-top">{{item.groupName}}
 					</div> 
-				<el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;font-size:12px;padding-top:5px;">  
+				</h3>
+				<el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width:100%;">  
 					<div  :class="v.isSelected=='1'?'checkCopyButton':'copyButton'" v-for="(v,valueIndex) in item.groupUsers" :key="valueIndex" @click="toggleSelected(index,valueIndex)">
 							{{v.username}}
 					</div>  
@@ -227,6 +229,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 }
 	.copyButton {
 		margin-left: 10px;
+		margin-top:2px;
 		border-radius: 20px;
 		padding: 10px 1px;  
 		border: 1px solid rgb(220, 223, 230);
@@ -243,6 +246,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 	.checkCopyButton {
 		/*color: #fff;*/
 		margin-left: 10px;
+		margin-top:2px;
 		border-radius: 20px;
 		padding: 10px 1px;  
 		border: 1px solid #FFA00A;