Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout

ant-design-vue-jeecg/src/views/newLayout/task_admin/task_content/TaskContent.vue

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

ant-design-vue-jeecg/src/views/newLayout/task_admin/task_content/content_card/ContentCard.vue

@@ -13,6 +13,7 @@
         <div class="card_content" :key="item.id">
           <el-card
             ref="card"
+            m
             class="little_card"
             :class="
               color == 'black'
@@ -239,11 +240,11 @@
                     >
                       <span
                         class="pic"
-                        @click="LookPeople(item.managerUsers)"
+                        @click="LookPeople(item)"
                         :style="{ left: index - 1 + 0.1 * index + 'rem' }"
                       >
                         <img
-                          :src="item.headpic"
+                          :src="ii"
                           alt=""
                           style="
                             width: 100%;
@@ -280,13 +281,18 @@
     >
       <template slot="title">
         <i class="el-icon-more" style="cursor: pointer"></i>
-        <el-dropdown trigger="click" style="position: absolute; left: 3rem">
+        <el-dropdown
+          trigger="click"
+          style="position: absolute; left: 3rem"
+          @command="handleClick"
+        >
           <span class="el-dropdown-link">
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item>黄金糕</el-dropdown-item>
-            <el-dropdown-item>狮子头</el-dropdown-item>
+            <el-dropdown-item v-for="p in people" :key="p.id" :command="p.id">
+              {{ p.name }}</el-dropdown-item
+            >
           </el-dropdown-menu>
         </el-dropdown>
       </template>
@@ -350,7 +356,7 @@
 
 <script>
 import { Container, Draggable } from 'vue-smooth-dnd'
-import { putAction } from '@/api/manage.js'
+import { putAction, getAction } from '@/api/manage.js'
 import TaskModal from '@/views/task/modules/TaskModal'
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -395,6 +401,17 @@ export default {
         className: 'drop-preview',
         animationDuration: '150',
         showOnTop: true
+      },
+      // 任务负责人id,名字
+      people: [
+        { id: 1, name: 'xxxs' },
+        { id: 2, name: 'aaa' }
+      ],
+      // 员工的信息
+      peopleData: {
+        name: '',
+        headpic: '',
+        project: []
       }
     }
   },
@@ -406,11 +423,35 @@ export default {
     }
   },
   methods: {
-    LookPeople(userid) {
-      console.log(userid)
+    // 点击负责人头像
+    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] }
+      // }
       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 = '大禹项目'