浏览代码

工作台文案修改

wangziqian 4 年之前
父节点
当前提交
37160b3739

+ 4 - 2
src/views/workbench/components/statisticsSection.vue

@@ -31,8 +31,10 @@
         </div>
         <div v-if="title ==='缺陷'" class="statistics-chart">
           <div class="two-title">
-            <h2>我提报的-未完成缺陷状态分布</h2>
-            <h2>提给我的-未完成缺陷状态分布</h2>
+            <h2 v-if="type === 'person'">我提报的-未完成缺陷状态分布</h2>
+            <h2 v-if="type === 'person'">提给我的-未完成缺陷状态分布</h2>
+            <h2 v-if="type === 'team'">团队提报的-未完成缺陷状态分布</h2>
+            <h2 v-if="type === 'team'">提给团队的-未完成缺陷状态分布</h2>
           </div>
           <div class="two-chart-contain">
             <div class="chart-contain">

+ 8 - 2
src/views/workbench/person/components/calenderDetail.vue

@@ -9,8 +9,14 @@
       <div class="detail-people item"><div class="label">参与人:</div>
         {{ nowDetailData.peopleObjectList.map(item=>item.name).join(',') }}
       </div>
-      <div class="detail-needs item"><div class="label">所属需求:</div>{{ nowDetailData.requireNames | arrToString }}</div>
-      <div class="detail-tasks item"><div class="label">关联任务:</div>{{ nowDetailData.taskNames | arrToString }}</div>
+      <div class="detail-needs item">
+        <div class="label">所属需求:</div>
+        {{ nowDetailData.requireNames | arrToString }}
+      </div>
+      <div class="detail-tasks item">
+        <div class="label">关联任务:</div>
+        {{ nowDetailData.taskNames | arrToString }}
+      </div>
       <div v-if="nowDetailData.origin === 0" class="footer">
         <div v-if="nowDetailData.isScheduleLocked === 0" class="cancel" @click="deleteSchedule">删除</div>
         <div v-if="nowDetailData.isScheduleLocked === 0" class="edit" @click="editSchedule">编辑</div>

+ 1 - 1
src/views/workbench/person/components/myFullCalendar.vue

@@ -182,7 +182,7 @@ export default {
     setIcon() {
       const eleList = document.getElementsByClassName('fc-title')
       Array.prototype.forEach.call(eleList, item => {
-        if (item.parentElement.childNodes.length > 3) {
+        if (item.parentElement.childNodes.length >= 3) {
           return
         }
         const div = document.createElement('div')

+ 6 - 1
src/views/workbench/person/index.vue

@@ -429,7 +429,12 @@ export default {
         let num = 0
         this.calendarEvents = res.data.map((item, index) => {
           const title = item.origin ? '日程' : '排期'
-          const require = `${item.requireNames && item.requireNames.length > 0 ? '所属需求:' + item.requireNames.join(',') : '所属需求:无'}`
+          let require = ''
+          if (item.requireNames && item.requireNames.length > 0) {
+            require = `'所属需求:'${item.requireNames.join(',')}`
+          } else if (item.taskNames && item.taskNames.length > 0) {
+            require = `'所属任务:'${item.taskNames.join(',')}`
+          }
           if (index >= 1 && item.id === res.data[index - 1].id) {
             num = num + 1
           }

+ 6 - 1
src/views/workbench/team/index.vue

@@ -506,7 +506,12 @@ export default {
         this.calendarEvents = res.data.map((item, index) => {
           const colorObj = this.mapMemberColor.get(item.peopleObject.idap)
           const title = item.origin ? '日程' : '排期'
-          const require = `${item.requireNames && item.requireNames.length > 0 ? '所属需求:' + item.requireNames.join(',') : '所属需求:无'}`
+          let require = ''
+          if (item.requireNames && item.requireNames.length > 0) {
+            require = `'所属需求:'${item.requireNames.join(',')}`
+          } else if (item.taskNames && item.taskNames.length > 0) {
+            require = `'所属任务:'${item.taskNames.join(',')}`
+          }
           return {
             id: item.id,
             title: `${title}:${item.peopleObject.name}:${item.name}-${item.desc || '无'};${item.origin ? '' : require}`,