qinzhipeng_v 5 سال پیش
والد
کامیت
8b22172046
2فایلهای تغییر یافته به همراه46 افزوده شده و 25 حذف شده
  1. 0 4
      src/router/index.js
  2. 46 21
      src/views/projectManage/taskList/taskViewDetails.vue

+ 0 - 4
src/router/index.js

@@ -201,7 +201,6 @@ export const constantRoutes = [
       {
         path: '/Platform/presentation',
         name: '报告管理',
-        hidden: true,
         component: () => import('@/views/Platform/presentation/testa'),
         redirect: '/Platform/presentation/testPresentation',
         meta: { title: '报告管理' },
@@ -209,21 +208,18 @@ export const constantRoutes = [
           {
             path: 'testPresentation',
             name: '日报报告',
-            hidden: true,
             component: () => import('@/views/Platform/presentation/testPresentation'),
             meta: { title: '日报报告' }
           },
           {
             path: 'ResultPage',
             name: '准出报告',
-            hidden: true,
             component: () => import('@/views/Platform/presentation/ResultPage'),
             meta: { title: '准出报告' }
           },
           {
             path: 'Assumptions',
             name: '提测报告',
-            hidden: true,
             component: () => import('@/views/Platform/presentation/Assumptions'),
             meta: { title: '提测报告' }
           },

+ 46 - 21
src/views/projectManage/taskList/taskViewDetails.vue

@@ -19,10 +19,10 @@
             <el-button size="mini" type="primary" plain>新建<i class="el-icon-arrow-down el-icon--right" />
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>新建Bug</el-dropdown-item>
-              <el-dropdown-item>新建提测报告</el-dropdown-item>
-              <el-dropdown-item>新建测试报告</el-dropdown-item>
-              <el-dropdown-item>新建准出报告</el-dropdown-item>
+              <el-dropdown-item @click.native="createReport(4, task_form)">新建Bug</el-dropdown-item>
+              <el-dropdown-item @click.native="createReport(1, task_form)">新建提测报告</el-dropdown-item>
+              <el-dropdown-item @click.native="createReport(2, task_form)">新建测试报告</el-dropdown-item>
+              <el-dropdown-item @click.native="createReport(3, task_form)">新建准出报告</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </span>
@@ -127,14 +127,14 @@
       </el-header>
       <el-footer class="footer" style=" height: auto;">
         <span style="text-align: right; margin: 1% 0 -3% 0;float:right;">
-          <el-button size="mini" type="primary" plain icon="el-icon-plus">提Bug</el-button>
+          <el-button size="mini" type="primary" plain icon="el-icon-plus" @click="createReport(4, task_form)">提Bug</el-button>
           <el-dropdown>
             <el-button size="mini" type="primary" plain>新建<i class="el-icon-arrow-down el-icon--right" />
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>新建提测报告</el-dropdown-item>
-              <el-dropdown-item>新建测试报告</el-dropdown-item>
-              <el-dropdown-item>新建准出报告</el-dropdown-item>
+              <el-dropdown-item @click.native="createReport(1, task_form)">新建提测报告</el-dropdown-item>
+              <el-dropdown-item @click.native="createReport(2, task_form)">新建测试报告</el-dropdown-item>
+              <el-dropdown-item @click.native="createReport(3, task_form)">新建准出报告</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </span>
@@ -239,7 +239,7 @@
           </el-tab-pane>
           <el-tab-pane label="评论">
             <p v-show="commentShow" style="color:#9B9B9B">还没有评论,快来评论吧!</p>
-            <div v-for="item of commentTxt" :key="item">{{ item.commentInfo.name }} &nbsp; &nbsp; <span style="color:#9B9B9B">{{ item.commentInfo.gmtCreater }}</span>
+            <div v-for="(item, value) of commentTxt" :key="value">{{ item.commentInfo.name }} &nbsp; &nbsp; <span style="color:#9B9B9B">{{ item.commentInfo.gmtCreater }}</span>
               <p>{{ item.commentInfo.content }}</p></div>
             <el-input v-model="content" rows="6" type="textarea" placeholder="请输入评论内容..." show-word-limit />
             <p style="text-align: right;">
@@ -447,23 +447,14 @@ export default {
           xAxis: {
             type: 'category',
             data: this.echarts_name,
-            axisLine: {
-              show: true,
-              lineStyle: {
-                type: 'dashed'
-              }
-            }
+            axisLine: { show: true, lineStyle: { type: 'dashed' }}
           },
           yAxis: [{ gridIndex: 0, axisTick: { show: false }, axisLabel: { show: false }, splitLine: { show: false }, axisLine: { show: false }}],
           series: [
             {
               data: this.echarts_value,
               type: 'bar',
-              itemStyle: {
-                normal: {
-                  color: '#409EFF'
-                }
-              },
+              itemStyle: { normal: { color: '#409EFF' }},
               label: {
                 show: true,
                 position: 'inside'
@@ -471,7 +462,7 @@ export default {
             }]
         })
         window.onresize = myChart.resize
-      }, 300)
+      }, 500)
     },
     handleCommand(command) {
       this.task_form.statusString = command.label
@@ -660,6 +651,40 @@ export default {
     },
     handleCurrentChange(curIndex) { //  分页
       this.curIndex = curIndex
+    },
+    createReport(e, ele) {
+      console.log(ele)
+      if (ele.typeString !== '服务端') {
+        switch (e) {
+          case 1:
+            this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: ele }}) // 客户端提测
+            break
+          case 2:
+            this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { task: ele, taskId: ele.id }}) // 客户端日报
+            break
+          case 3:
+            this.$router.push({ path: '/Platform/presentation/ClientAcceptance', query: { task: ele }}) // 客户端准出
+            break
+          case 4:
+            this.$router.push({ name: '新建Bug', query: { id: ele.id }}) // 缺陷报告
+            break
+        }
+      } else {
+        switch (e) {
+          case 1:
+            this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: ele }}) // 服务端提测
+            break
+          case 2:
+            this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { task: ele, taskId: ele.id }}) // 服务端日报
+            break
+          case 3:
+            this.$router.push({ path: '/Platform/presentation/Acceptance', query: { task: ele }}) // 服务端准出
+            break
+          case 4:
+            this.$router.push({ name: '新建Bug', query: { id: ele.id }}) // 缺陷报告
+            break
+        }
+      }
     }
   }
 }