This commit is contained in:
熊成强 2020-11-17 10:50:55 +08:00
parent b4c30ccf3d
commit 10bce0a0a5
5 changed files with 11 additions and 8 deletions

View File

@ -76,8 +76,7 @@ export default {
this.$emit('update:show', false) this.$emit('update:show', false)
}, },
getRight () { getRight () {
this.isShow = false this.$emit('cancel')
this.$emit('update:show', false)
} }
} }

View File

@ -35,7 +35,7 @@
placeholder="请选择考评组管理员" placeholder="请选择考评组管理员"
readonly readonly
:value="Ground.title?(Ground.title+ ' 等'+ Ground.list.length + '人'):''"> :value="Ground.title?(Ground.title+ ' 等'+ Ground.list.length + '人'):''">
<i slot="suffix" class="el-input__icon el-icon-edit"></i> <i @click='showRight=true' slot="suffix" class="el-input__icon el-icon-edit"></i>
</el-input> </el-input>
</el-tooltip> </el-tooltip>
<div class="commonFont" style="font-size:12px">设置哪些管理员可以管理该考评组</div> <div class="commonFont" style="font-size:12px">设置哪些管理员可以管理该考评组</div>
@ -51,7 +51,7 @@
size="small" size="small"
:value ="showData.title + '等' + showData.list.length + '个部门' || '请选择部门'" :value ="showData.title + '等' + showData.list.length + '个部门' || '请选择部门'"
readonly> readonly>
<i slot="suffix" class="el-input__icon el-icon-edit"></i> <i @click="handleGetChoose('isShow')" slot="suffix" class="el-input__icon el-icon-edit"></i>
</el-input> </el-input>
<i @click="handleClearList('showData')" style="margin-left:10px;cursor: pointer;" class="el-icon-delete"></i> <i @click="handleClearList('showData')" style="margin-left:10px;cursor: pointer;" class="el-icon-delete"></i>
</div> </div>
@ -62,7 +62,7 @@
size="small" size="small"
:value ="personnelList.title + '等' + personnelList.list.length + '个人'" :value ="personnelList.title + '等' + personnelList.list.length + '个人'"
readonly> readonly>
<i slot="suffix" class="el-input__icon el-icon-edit"></i> <i @click="handleGetChoose('isShowPersonnel')" slot="suffix" class="el-input__icon el-icon-edit"></i>
</el-input> </el-input>
<i @click="handleClearList('personnelList')" style="margin-left:10px;cursor: pointer;" class="el-icon-delete"></i> <i @click="handleClearList('personnelList')" style="margin-left:10px;cursor: pointer;" class="el-icon-delete"></i>
</div> </div>
@ -81,7 +81,7 @@
size="small" size="small"
:value ="outIdsLsit.title + '等' + outIdsLsit.list.length + '个人'" :value ="outIdsLsit.title + '等' + outIdsLsit.list.length + '个人'"
readonly> readonly>
<i slot="suffix" class="el-input__icon el-icon-edit"></i> <i @clcik="handleGetChoose('isSshowOutIds')" slot="suffix" class="el-input__icon el-icon-edit"></i>
</el-input> </el-input>
<i @click="handleClearList('outIdsLsit')" style="margin-left:10px;cursor: pointer;" class="el-icon-delete"></i> <i @click="handleClearList('outIdsLsit')" style="margin-left:10px;cursor: pointer;" class="el-icon-delete"></i>
</div> </div>

View File

@ -314,12 +314,13 @@ export default {
}, },
// id // id
handleWeiDu (item) { handleWeiDu (item) {
return this.dimensionsList.filter(i => i.id === item.type)[0].length > 0 ? this.dimensionsList.filter(i => i.id === item.type)[0].length.name : '' return this.dimensionsList.filter(i => i.id === item.type).length > 0 ? this.dimensionsList.filter(i => i.id === item.type)[0].name : ''
}, },
// //
async handleGetDimensions () { async handleGetDimensions () {
try { try {
let res = await getDimensions() let res = await getDimensions()
console.log('res: ', res)
if (res.code !== 200) { if (res.code !== 200) {
this.dimensionsList = [] this.dimensionsList = []
return return

View File

@ -169,7 +169,7 @@ export default {
} }
&-right{ &-right{
box-sizing: border-box; box-sizing: border-box;
width: 330px; width: 600px;
min-height: 100px; min-height: 100px;
padding: 25px 20px; padding: 25px 20px;
&-content{ &-content{

View File

@ -18,6 +18,9 @@ export default {
data () { data () {
return { return {
option: { option: {
title: {
text: '个人成长曲线'
},
color: ['#3398DB'], color: ['#3398DB'],
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',