Compare commits

..

No commits in common. 'e7809347318d120a6f332bb3150274d752568f25' and '465098281cd2a176ffaeaf32d13f98312c83311c' have entirely different histories.

  1. 6
      ant-design-vue-jeecg/src/views/newLayout/task_admin/task_content/TaskContent.vue
  2. 57
      ant-design-vue-jeecg/src/views/newLayout/task_admin/task_content/content_card/ContentCard.vue

@ -211,11 +211,7 @@ export default {
this.TotalData[index].data = res.result.records
this.TotalData[index].total = res.result.total
this.TotalData[index].data.forEach((element) => {
let arr = []
for (let i = 0; i < element.headpic.split(',').length; i++) {
arr = [...arr, getFileAccessHttpUrl(element.headpic.split(',')[i])]
}
element.headpic = arr.join(',')
element.headpic = getFileAccessHttpUrl(element.headpic)
element.taskPic = getFileAccessHttpUrl(element.taskPic)
element.taskFile = getFileAccessHttpUrl(element.taskFile)
})

@ -13,7 +13,6 @@
<div class="card_content" :key="item.id">
<el-card
ref="card"
m
class="little_card"
:class="
color == 'black'
@ -240,11 +239,11 @@
>
<span
class="pic"
@click="LookPeople(item)"
@click="LookPeople(item.managerUsers)"
:style="{ left: index - 1 + 0.1 * index + 'rem' }"
>
<img
:src="ii"
:src="item.headpic"
alt=""
style="
width: 100%;
@ -281,18 +280,13 @@
>
<template slot="title">
<i class="el-icon-more" style="cursor: pointer"></i>
<el-dropdown
trigger="click"
style="position: absolute; left: 3rem"
@command="handleClick"
>
<el-dropdown trigger="click" style="position: absolute; left: 3rem">
<span class="el-dropdown-link">
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="p in people" :key="p.id" :command="p.id">
{{ p.name }}</el-dropdown-item
>
<el-dropdown-item>黄金糕</el-dropdown-item>
<el-dropdown-item>狮子头</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
@ -356,7 +350,7 @@
<script>
import { Container, Draggable } from 'vue-smooth-dnd'
import { putAction, getAction } from '@/api/manage.js'
import { putAction } from '@/api/manage.js'
import TaskModal from '@/views/task/modules/TaskModal'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@ -401,17 +395,6 @@ export default {
className: 'drop-preview',
animationDuration: '150',
showOnTop: true
},
// id,
people: [
{ id: 1, name: 'xxxs' },
{ id: 2, name: 'aaa' }
],
//
peopleData: {
name: '',
headpic: '',
project: []
}
}
},
@ -423,35 +406,11 @@ export default {
}
},
methods: {
//
async LookPeople(user) {
user = user.headpic.split(',').map((i) => {
// getFileAccessHttpUrl(i)
console.log('sss', i)
})
console.log('eeee', user)
// let userid = user.managerUsers.split(',')
// let username = user.managerUsers_dictText.split(',')
// for (let i = 0; i < userid.length; i++) {
// this.people[i] = { id: userid[i], name: username[i] }
// }
LookPeople(userid) {
console.log(userid)
this.drawer = true
this.Check()
},
//
async getPeopleData(userId) {
const res = await getAction(this.url.list, { userId })
console.log('llll', res)
},
//
handleClick(command) {
console.log('dddeeee', command)
this.getPeopleData(command)
},
//
Check() {
const s = '大禹项目'

Loading…
Cancel
Save