Browse Source

优化

master
陈裕财 4 years ago
parent
commit
80aedb0605
  1. 6
      src/views/mdp/arc/tag/TagMng.vue
  2. 18
      src/views/xm/core/skill/skillMng.vue
  3. 8
      src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

6
src/views/mdp/arc/tag/TagMng.vue

@ -42,7 +42,7 @@
</el-col> </el-col>
</el-row> </el-row>
</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"> <el-row v-for="(item,index) in convertTags" :key="item.categoryId" class="padding">
<h3> <h3>
<div> <div>
@ -61,7 +61,7 @@
</el-col> </el-col>
</el-row> </el-row>
</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"> <el-row v-for="(item,index) in convertTags" :key="item.categoryId" class="padding">
<h3> <h3>
<div> <div>
@ -660,6 +660,7 @@
<style scoped> <style scoped>
.copyButton { .copyButton {
margin-left: 5px; margin-left: 5px;
margin-top:2px;
border-radius: 20px; border-radius: 20px;
padding: 10px 1px; padding: 10px 1px;
border: 1px solid rgb(220, 223, 230); border: 1px solid rgb(220, 223, 230);
@ -676,6 +677,7 @@
.checkCopyButton { .checkCopyButton {
/*color: #fff;*/ /*color: #fff;*/
margin-left: 5px; margin-left: 5px;
margin-top:2px;
border-radius: 20px; border-radius: 20px;
padding: 10px 1px; padding: 10px 1px;
border: 1px solid #ffa00a; border: 1px solid #ffa00a;

18
src/views/xm/core/skill/skillMng.vue

@ -42,12 +42,12 @@
</el-col> </el-col>
</el-row> </el-row>
</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> <h3>
<div> <div>
{{item.categoryName+(item.pubc=='1'?'(公共)':'')}} {{item.categoryName+(item.pubc=='1'?'(公共)':'')}}
</div>
</div>
</h3> </h3>
<el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;"> <el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
<div <div
@ -61,17 +61,15 @@
</el-col> </el-col>
</el-row> </el-row>
</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> <div>
{{item.categoryName+(item.pubc=='1'?'(公共)':'')}} {{item.categoryName+(item.pubc=='1'?'(公共)':'')}}
<i <i
class="el-icon-close closeStyle" class="el-icon-close closeStyle"
@click.stop="delTagCategoryMethod(item.categoryId,index)" @click.stop="delTagCategoryMethod(item.categoryId,index)"
></i>: ></i>:
</div>
</h3>
</div>
<el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;"> <el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;width: 100%;">
<div <div
:class="'copyButton'" :class="'copyButton'"
@ -479,6 +477,7 @@ export default {
<style scoped> <style scoped>
.copyButton { .copyButton {
margin-left: 5px; margin-left: 5px;
margin-top:2px;
border-radius: 20px; border-radius: 20px;
padding: 10px 1px; padding: 10px 1px;
border: 1px solid rgb(220, 223, 230); border: 1px solid rgb(220, 223, 230);
@ -495,8 +494,9 @@ export default {
.checkCopyButton { .checkCopyButton {
/*color: #fff;*/ /*color: #fff;*/
margin-left: 5px; margin-left: 5px;
margin-top:2px;
border-radius: 20px; border-radius: 20px;
padding: 10px 1px;
padding: 2px 1px;
border: 1px solid #ffa00a; border: 1px solid #ffa00a;
/*background-color: rgba(230, 162, 60, .1);*/ /*background-color: rgba(230, 162, 60, .1);*/
/* background-color: #f9f9f9; */ /* background-color: #f9f9f9; */

8
src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

@ -15,9 +15,11 @@
</el-row> </el-row>
<el-row class="page-height-70 padding-top" v-loading="load.list"> <el-row class="page-height-70 padding-top" v-loading="load.list">
<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index"> <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> </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)"> <div :class="v.isSelected=='1'?'checkCopyButton':'copyButton'" v-for="(v,valueIndex) in item.groupUsers" :key="valueIndex" @click="toggleSelected(index,valueIndex)">
{{v.username}} {{v.username}}
</div> </div>
@ -227,6 +229,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
} }
.copyButton { .copyButton {
margin-left: 10px; margin-left: 10px;
margin-top:2px;
border-radius: 20px; border-radius: 20px;
padding: 10px 1px; padding: 10px 1px;
border: 1px solid rgb(220, 223, 230); border: 1px solid rgb(220, 223, 230);
@ -243,6 +246,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
.checkCopyButton { .checkCopyButton {
/*color: #fff;*/ /*color: #fff;*/
margin-left: 10px; margin-left: 10px;
margin-top:2px;
border-radius: 20px; border-radius: 20px;
padding: 10px 1px; padding: 10px 1px;
border: 1px solid #FFA00A; border: 1px solid #FFA00A;

Loading…
Cancel
Save