Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/components/select/selectPeople.vue

@@ -32,6 +32,11 @@ export default {
       default: '',
       required: true
     },
+    img: {
+      type: String,
+      default: '',
+      required: false
+    },
     init: {
       type: Boolean,
       default: false,
@@ -47,16 +52,22 @@ export default {
     }
   },
   watch: {
-    value: {
+    // value: {
+    //   handler(newV) {
+    //     const isEx = this.peopleList.find(item => {
+    //       return item.name === newV || item.idap === newV
+    //     })
+    //     if (isEx) {
+    //       return false
+    //     }
+    //     this.inputValue = newV
+    //     this.memberQuery()
+    //   },
+    //   immediate: true
+    // },
+    img: {
       handler(newV) {
-        const isEx = this.peopleList.find(item => {
-          return item.name === newV || item.idap === newV
-        })
-        if (isEx) {
-          return false
-        }
-        this.inputValue = newV
-        this.memberQuery()
+        this.peopleImg = newV
       },
       immediate: true
     }

src/views/projectManage/projectList/projectViewDetails.vue

@@ -6,7 +6,11 @@
           <div class="header-title">
             <span class="title-id">PROJECT-{{ form_query.id }}</span>
             <el-tooltip class="item" effect="dark" :content="form_query.name" placement="bottom">
-              <span class="title-name">{{ form_query.name }}</span>
+              <span
+                v-clipboard:copy="form_query.name"
+                v-clipboard:success="copyName"
+                class="title-name"
+              >{{ form_query.name }}</span>
             </el-tooltip>
           </div>
           <el-dropdown placement="bottom" @command="handleCommand">
@@ -184,6 +188,9 @@
 </template>
 <script>
 const _ = require('lodash')
+import Vue from 'vue'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
 import {
   projectList,
   projectUpdate,
@@ -377,6 +384,9 @@ export default {
       if (this.$refs['needs-list']) {
         this.$refs['needs-list'].getNeedsList()
       }
+    },
+    copyName(name) { // 复制名字
+      this.$message({ message: '复制成功', type: 'success', duration: 1000, offset: 150 })
     }
   }
 }
@@ -392,6 +402,9 @@ export default {
 }
 .main-header {
   @include main-header;
+  .title-name {
+    cursor: pointer;
+  }
 }
 .main-header::after {
   @include main-header-after;

src/views/projectManage/requirement/requirementDetail.vue

@@ -7,7 +7,11 @@
           <div class="header-title">
             <span class="title-id">REQUIREMENT-{{ form_query.id }}</span>
             <el-tooltip class="item" effect="dark" :content="form_query.name" placement="bottom">
-              <span class="title-name">{{ form_query.name }}</span>
+              <span
+                v-clipboard:copy="form_query.name"
+                v-clipboard:success="copyName"
+                class="title-name"
+              >{{ form_query.name }}</span>
             </el-tooltip>
           </div>
           <el-dropdown placement="bottom" @command="updateStatus">
@@ -247,6 +251,9 @@
 </template>
 <script>
 const _ = require('lodash')
+import Vue from 'vue'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
 import {
   updateRequirement,
   getRequirementById,
@@ -520,6 +527,9 @@ export default {
       if (this.$refs['tasks-list']) {
         this.$refs['tasks-list'].get_allTask()
       }
+    },
+    copyName(name) { // 复制名字
+      this.$message({ message: '复制成功', type: 'success', duration: 1000, offset: 150 })
     }
   }
 }
@@ -535,6 +545,9 @@ export default {
 }
 .main-header {
   @include main-header;
+  .title-name {
+    cursor: pointer;
+  }
 }
 .main-header::after {
   @include main-header-after;

src/views/projectManage/taskList/childrenTask/addChildrenList.vue

@@ -38,7 +38,7 @@
           />
         </div>
         <div class="select-people">
-          <select-people :value.sync="item.owner" :init="true" @change="updateOwner(item)" />
+          <select-people :value.sync="item.owner" :img="item.ownerObj.phoneUrl" :init="true" @change="updateOwner(item)" />
         </div>
         <div class="child-control">
           <el-popover
@@ -166,6 +166,7 @@ export default {
         bizId: this.formData.bizId,
         endTime: null,
         owner: localStorage.getItem('username'),
+        ownerObj: { phoneUrl: localStorage.getItem('UserAvatar') },
         status: 0,
         edit: true,
         newNode: true

src/views/projectManage/taskList/childrenTask/childDetail.vue

@@ -263,6 +263,7 @@ export default {
         bizId: this.formData.bizId,
         endTime: null,
         owner: localStorage.getItem('username'),
+        ownerObj: { phoneUrl: localStorage.getItem('UserAvatar') },
         status: 0,
         edit: true,
         newNode: true

src/views/projectManage/taskList/childrenTask/childDrawer.vue

@@ -316,6 +316,7 @@ export default {
         bizId: this.formData.bizId,
         endTime: null,
         owner: localStorage.getItem('username'),
+        ownerObj: { phoneUrl: localStorage.getItem('UserAvatar') },
         status: 0,
         edit: true,
         newNode: true

src/views/projectManage/taskList/childrenTask/childrenList.vue

@@ -31,11 +31,11 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="负责人" width="120" align="center" show-overflow-tooltip>
+      <el-table-column label="负责人" width="120" align="left" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.ownerObject ? scope.row.ownerObject.name : '' }}</template>
       </el-table-column>
-      <el-table-column label="开始时间" width="120" align="center" prop="startTime" show-overflow-tooltip />
-      <el-table-column label="结束时间" width="120" align="center" prop="endTime" show-overflow-tooltip />
+      <el-table-column label="开始时间" width="120" align="left" prop="startTime" show-overflow-tooltip />
+      <el-table-column label="结束时间" width="120" align="left" prop="endTime" show-overflow-tooltip />
       <el-table-column label="任务进度" width="200" align="center">
         <template slot-scope="scope">
           <el-progress :percentage="scope.row.process" color="#409eff" style="width: 100%" />