wangziqian %!s(int64=5) %!d(string=hai) anos
pai
achega
f2ad4046a5

+ 12 - 1
src/views/projectManage/dialog_vue.vue

@@ -103,6 +103,13 @@ import { taskCreate, memberQueryMemberInfoByIDAPorName, configShowTaskEnum, conf
 import { projectList, settingGetBizList } from '@/api/projectIndex'
 import { settingQueryBizModuleList } from '@/api/defectManage'
 export default {
+  props: {
+    noJump: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  },
   data() {
     return {
       arr_priority: [{ value: 0, name: 'P0' }, { value: 1, name: 'P1' }, { value: 2, name: 'P2' }, { value: 3, name: 'P3' }],
@@ -296,7 +303,11 @@ export default {
           taskCreate({ taskInfoDO, user }).then(res => {
             this.dialogFormVisible = false
             this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
-            this.$router.push({ name: '任务详情', query: { id: res.data.id }})
+            if (!this.noJump) {
+              this.$router.push({ name: '任务详情', query: { id: res.data.id }})
+            } else {
+              this.$emit('change')
+            }
           })
         }
       })

+ 1 - 1
src/views/projectManage/projectList/components/taskList.vue

@@ -72,7 +72,7 @@
         <template slot-scope="scope">{{ scope.row.requireName }}</template>
       </el-table-column>
       <el-table-column label="跟版客户端" width="120" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.app }}</template>
+        <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
       </el-table-column>
       <el-table-column label="开发负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.rdObject ? scope.row.rdObject.name : '' }}</template>

+ 6 - 4
src/views/projectManage/requirement/components/dataStatistics.vue

@@ -63,16 +63,18 @@ export default {
     }
   },
   mounted() {
-    this.getProjectSumData()
+    this.getRequireSumData()
   },
   methods: {
-    async getProjectSumData() { // 获取数据
+    async getRequireSumData() { // 获取数据
       const res = await getRequireSumData(this.$route.query.id)
       if (res.code === 200) {
         this.taskData = res.data.taskData
         this.bugData = res.data.bugData
-        this.setDataChart(this.taskData.detail, 'echartsOption2')
-        this.setDataChart(this.bugData.detail, 'echartsOption3')
+        this.$nextTick(() => {
+          this.setDataChart(this.taskData.detail, 'echartsOption2')
+          this.setDataChart(this.bugData.detail, 'echartsOption3')
+        })
       }
     },
     setDataChart(data, obj) {

+ 6 - 10
src/views/projectManage/requirement/components/taskList.vue

@@ -69,7 +69,7 @@
         </template>
       </el-table-column>
       <el-table-column label="跟版客户端" width="120" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.app }}</template>
+        <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
       </el-table-column>
       <el-table-column label="开发负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.rdObject ? scope.row.rdObject.name : '' }}</template>
@@ -107,7 +107,7 @@
 import TestReport from '@/views/Platform/presentation/Templates/TestReport' // 提测
 import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' // 日报
 import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
-import { getTaskByRequireId } from '@/api/requirement'
+import { taskList } from '@/api/projectIndex'
 import { taskUpdate } from '@/api/projectViewDetails'
 import { configShowTaskEnum } from '@/api/taskIndex'
 import scheduleList from './scheduleList'
@@ -165,15 +165,11 @@ export default {
   },
   methods: {
     async get_allTask() { // 获取全部任务
-      const res = await getTaskByRequireId({
-        id: this.$route.query.id
+      const res = await taskList({
+        requireId: this.$route.query.id
       })
-      if (res.code === 200 && res.data) {
-        console.log(res)
-        this.all_task = res.data.taskDetails || []
-        // for (const [key, value] of Object.entries(res.data[0])) {
-        //   console.log(`${key}: ${value}`)
-        // }
+      if (res.code === 200) {
+        this.all_task = res.data
       }
     },
     async getTaskStatus() { // 获取任务状态列表

+ 16 - 4
src/views/projectManage/requirement/requirementDetail.vue

@@ -158,7 +158,7 @@
       <!-- 任务 -->
       <el-container v-if="activeName === '2'" class="is-vertical">
         <section class="main-section contain">
-          <tasks-list />
+          <tasks-list ref="tasks-list" />
         </section>
       </el-container>
       <!-- 任务 -->
@@ -172,7 +172,7 @@
       <!-- 统计 -->
       <el-container v-if="activeName === '4'" class="is-vertical">
         <section class="main-section contain">
-          <data-statistics @change="getRequirementById" />
+          <data-statistics ref="data-statistics" @change="getRequirementById" />
         </section>
       </el-container>
       <!-- 统计 -->
@@ -202,8 +202,8 @@
         </span>
       </el-dialog>
       <!-- 删除 -->
-      <openDialog v-if="task_open" ref="task_createdUpdata" />
-      <createdBug v-if="bug_open" ref="createdBug" :required="requirementId" />
+      <openDialog v-if="task_open" ref="task_createdUpdata" :no-jump="true" @change="reloadList" />
+      <createdBug v-if="bug_open" ref="createdBug" :required="requirementId" @reloadList="reloadList" />
       <drawer
         ref="drawer"
         title="需求成员"
@@ -422,6 +422,18 @@ export default {
       this.$nextTick(() => {
         this.$refs.createdBug.init(1)
       })
+    },
+    reloadList() {
+      this.getRequirementById()
+      if (this.$refs['bugTableDialog']) {
+        this.$refs['bugTableDialog'].bugGetTableList()
+      }
+      if (this.$refs['data-statistics']) {
+        this.$refs['data-statistics'].getRequireSumData()
+      }
+      if (this.$refs['tasks-list']) {
+        this.$refs['tasks-list'].get_allTask()
+      }
     }
   }
 }

+ 11 - 2
src/views/projectManage/taskList/taskViewDetail.vue

@@ -174,12 +174,12 @@
       <!-- 统计 -->
       <el-container v-if="activeName === '4'" class="is-vertical">
         <section class="main-section contain">
-          <data-statistics />
+          <data-statistics ref="data-statistics" />
         </section>
       </el-container>
       <!-- 统计 -->
       <!-- 新建(bug) -->
-      <createdBug v-if="bug_open" ref="createdBug" />
+      <createdBug v-if="bug_open" ref="createdBug" @reloadList="reloadList" />
       <Test-report v-if="dialogTest" ref="TestReport" />
       <Daily-report v-if="dialogDaily" ref="DailyReport" />
       <Client-report v-if="dialogClient" ref="ClientReport" />
@@ -458,6 +458,15 @@ export default {
           this.$nextTick(() => { this.$refs.ClientReport.init(1, ele) })
           break
       }
+    },
+    reloadList() {
+      this.taskGet()
+      if (this.$refs['bugTableDialog']) {
+        this.$refs['bugTableDialog'].bugGetTableList()
+      }
+      if (this.$refs['data-statistics']) {
+        this.$refs['data-statistics'].getRequireSumData()
+      }
     }
   }
 }

+ 2 - 2
src/views/projectManage/version/list/index.vue

@@ -77,7 +77,7 @@
                     <el-tooltip class="item" effect="dark" placement="bottom" :content="scope.row.requirementName" :disabled="scope.row.requirementName.length < 16">
                       <div style="cursor: pointer;" @click="getToRequirementDetails(scope.row.requirementId)">
                         {{ getRequirementName(scope.row.requirementName) }}
-                        <div v-if="scope.row.delay" class="div_requirement_name">{{ searchTitle.version +'版本已延期' }}</div>
+                        <!-- <div v-if="scope.row.delay" class="div_requirement_name">{{ searchTitle.version +'版本已延期' }}</div> -->
                       </div>
                     </el-tooltip>
                   </div>
@@ -338,7 +338,7 @@ export default {
       }
     },
     getToRequirementDetails(id) {
-      this.$router.push({ name: '需求详情', params: { id: id + '' }})
+      this.$router.push({ name: '需求详情', query: { id: id }})
     },
     // 分页pageSize选择
     handleSizeChange(pageSize) {