项目管理上线下咯

src/api/testPresentetion.js

@@ -56,3 +56,27 @@ export function bugDailyList(data) {
     data
   })
 }
+// 日报
+export function dailyReport(params) {
+  return request({
+    url: mockUrl + '/dailyReport/get',
+    method: 'get',
+    params
+  })
+}
+// 提测报告
+export function launchTest(params) {
+  return request({
+    url: mockUrl + '/launchTest/get',
+    method: 'get',
+    params
+  })
+}
+// echarts
+export function projectTestReport(params) {
+  return request({
+    url: mockUrl + '/projectTestReport/get',
+    method: 'get',
+    params
+  })
+}

src/views/Platform/presentation/Assumptions.vue

@@ -175,7 +175,7 @@ export default {
           this.haha = { haha: vel }
         }
       }
-      this.$router.push({ path: '/Platform/presentation/acceptTheReport', query: { data: this.haha.haha }})
+      this.$router.push({ path: '/Platform/presentation/acceptTheReport', query: { id: e }})
     },
     errorFun() {
       this.$notify({ title: 'Failed', message: 'Created Failed', type: 'error', duration: 2000 })

src/views/Platform/presentation/ResultPage.vue

@@ -99,7 +99,7 @@ export default {
           this.haha = { haha: vel }
         }
       }
-      this.$router.push({ path: '/Platform/presentation/ResultPageyL', query: { data: this.haha.haha }})
+      this.$router.push({ path: '/Platform/presentation/ResultPageyL', query: { id: e }})
     },
 
     // 删除报告

src/views/Platform/presentation/ResultPageyL.vue

@@ -222,6 +222,7 @@
 
 <script>
 import { projectTestReportSendmail, bugFinishList } from '@/api/ResultPage'
+import { projectTestReport } from '@/api/testPresentetion'
 import html2canvas from 'html2canvas'
 
 export default {
@@ -274,12 +275,13 @@ export default {
     }
   },
   created() {
-    this.getRouterData()
+    this.idGet()
+    // this.getRouterData()
   },
   methods: {
-    getRouterData() {
-      if (this.$route.query.data) {
-        this.ClientDatayl = this.$route.query.data
+    idGet() {
+      projectTestReport({ id: this.$route.query.id }).then((res) => {
+        this.ClientDatayl = res.data
         this.editorElem1 = this.ClientDatayl.projectBackground
         this.editorElems1 = this.ClientDatayl.fctInfo
         this.editorFrom1 = this.ClientDatayl.sctInfo
@@ -366,8 +368,8 @@ export default {
           case 2: this.moniterResult = '未通过'; this.moniterResultChange.color = 'red'; break
           case 3: this.moniterResult = '未执行'; this.moniterResultChange.color = 'Orange'; break
         }
-      }
-      this.getBugData(this.bugNum)
+        this.getBugData(this.bugNum)
+      })
     },
     getBugData(e) {
       bugFinishList(e).then(res => {

src/views/Platform/presentation/acceptTheReport.vue

@@ -120,6 +120,7 @@
 <script>
 import { launchTestSendmail } from '@/api/ResultPage'
 import html2canvas from 'html2canvas'
+import { launchTest } from '@/api/testPresentetion'
 
 export default {
   name: 'AcceptTheReport',
@@ -147,7 +148,8 @@ export default {
     }
   },
   created() {
-    this.getRouterData()
+    // this.getRouterData()
+    this.idGet()
   },
   methods: {
     download() {
@@ -163,51 +165,53 @@ export default {
         this.$message({ type: 'info', message: '取消输入' })
       })
     },
-    getRouterData() {
-      this.fromCreateData = this.$route.query.data
-      if (this.fromCreateData.type === 2) {
-        this.towShow = false
-        this.oneShow = true
-      } else {
-        this.oneShow = false
-        this.towShow = true
-      }
-      this.name = this.fromCreateData.name
-      this.joinTestOne = this.fromCreateData.joinTest
-      this.moduleInfoOne = this.fromCreateData.moduleInfo
-      if (this.fromCreateData.safeInfo !== '') {
-        this.showData = true
-        this.safeStatus = '是'
-        this.safeStatus1.color = 'red'
-      } else {
-        this.showData = false
-        this.safeStatus = '否'
-        this.safeStatus1.color = 'green'
-      }
-      if (this.fromCreateData.lateReason !== '') {
-        this.showDelay = true
-        this.lateStatus = '是'
-      } else {
-        this.showDelay = false
-        this.lateStatus = '否'
-        this.lateStatus1.color = 'green'
-      }
-      if (this.fromCreateData.configInfo !== '') {
-        this.showDelay1 = true
-        this.config = '是'
-      } else {
-        this.showDelay1 = false
-        this.config = '否'
-        this.configInfo1.color = 'red'
-      }
-      if (this.fromCreateData.dependentComponents !== '') {
-        this.showDelay2 = true
-        this.dependentCom = '是'
-      } else {
-        this.showDelay2 = false
-        this.dependentCom = '否'
-        this.dependentComponents1.color = 'red'
-      }
+    idGet() {
+      launchTest({ id: this.$route.query.id }).then((res) => {
+        this.fromCreateData = res.data
+        if (this.fromCreateData.type === 2) {
+          this.towShow = false
+          this.oneShow = true
+        } else {
+          this.oneShow = false
+          this.towShow = true
+        }
+        this.name = this.fromCreateData.name
+        this.joinTestOne = this.fromCreateData.joinTest
+        this.moduleInfoOne = this.fromCreateData.moduleInfo
+        if (this.fromCreateData.safeInfo !== '') {
+          this.showData = true
+          this.safeStatus = '是'
+          this.safeStatus1.color = 'red'
+        } else {
+          this.showData = false
+          this.safeStatus = '否'
+          this.safeStatus1.color = 'green'
+        }
+        if (this.fromCreateData.lateReason !== '') {
+          this.showDelay = true
+          this.lateStatus = '是'
+        } else {
+          this.showDelay = false
+          this.lateStatus = '否'
+          this.lateStatus1.color = 'green'
+        }
+        if (this.fromCreateData.configInfo !== '') {
+          this.showDelay1 = true
+          this.config = '是'
+        } else {
+          this.showDelay1 = false
+          this.config = '否'
+          this.configInfo1.color = 'red'
+        }
+        if (this.fromCreateData.dependentComponents !== '') {
+          this.showDelay2 = true
+          this.dependentCom = '是'
+        } else {
+          this.showDelay2 = false
+          this.dependentCom = '否'
+          this.dependentComponents1.color = 'red'
+        }
+      })
     },
     open() { this.$router.push({ path: '/Platform/presentation/Assumptions' }) },
     sendReport(e, ele) {

src/views/Platform/presentation/testPresentation.vue

@@ -9,7 +9,7 @@
       <el-table :data="tableData" fit border style="width: 100%">
         <el-table-column label="报告名称" min-width="280" align="center">
           <template slot-scope="scope">
-            <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row)">{{ scope.row.reportName }}</a>
+            <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row.id)">{{ scope.row.reportName }}</a>
           </template>
         </el-table-column>
         <el-table-column label="报告人" min-width="180" align="center">
@@ -97,7 +97,7 @@ export default {
     },
     // 查看跳转
     toReportView(ele) {
-      this.$router.push({ path: '/Platform/presentation/testPresenyL', query: { data: ele }})
+      this.$router.push({ path: '/Platform/presentation/testPresenyL', query: { id: ele }})
     },
     // 删除报告
     delePresentation(e) {

src/views/Platform/presentation/testPresenyL.vue

@@ -68,7 +68,7 @@
 <script>
 import echarts from 'echarts'
 
-import { bugDailyList } from '@/api/testPresentetion'
+import { bugDailyList, dailyReport } from '@/api/testPresentetion'
 import { dailyReportSendmail } from '@/api/ResultPage'
 import html2canvas from 'html2canvas'
 export default {
@@ -113,47 +113,48 @@ export default {
     }
   },
   created() {
-    this.getRouterData()
+    // this.getRouterData()
+    this.idGet()
   },
   methods: {
-    getRouterData() {
-      if (this.$route.query.data) {
-        this.fromCreat = this.$route.query.data
+    idGet() {
+      dailyReport({ id: this.$route.query.id }).then((res) => {
+        this.fromCreat = res.data
         this.name = this.fromCreat.reportName
         this.gntCreateEnd = this.fromCreat.gmtCreate
         this.bugshow = this.fromCreat.bugExplain
         this.TestProgress = this.fromCreat.testExplain
         this.projectProgress = this.fromCreat.problemRisks
-      }
-      this.pro = { projectId: this.fromCreat.projectId, taskId: this.fromCreat.taskId, gntCreateEnd: this.gntCreateEnd }
-      bugDailyList(this.pro).then(res => {
-        this.dateList = res.data.dateList
-        this.statusMap = res.data.statusMap
-        this.statusList = res.data.statusList
-        this.numList = res.data.bugMap
-        for (var ele of this.numList) {
-          this.bugName.push(ele.name)
-        }
+        this.pro = { projectId: this.fromCreat.projectId, taskId: this.fromCreat.taskId, gntCreateEnd: this.gntCreateEnd }
+        bugDailyList(this.pro).then(res => {
+          this.dateList = res.data.dateList
+          this.statusMap = res.data.statusMap
+          this.statusList = res.data.statusList
+          this.numList = res.data.bugMap
+          for (var ele of this.numList) {
+            this.bugName.push(ele.name)
+          }
 
-        echarts.init(document.getElementById('lineShow')).setOption({
-          title: { left: 'center', text: 'bug数量汇总' },
-          tooltip: { trigger: 'axis' },
-          legend: { top: 30, data: this.bugName },
-          grid: { left: '5%', right: '25%', bottom: '12%', containLabel: true },
-          // toolbox: { feature: { saveAsImage: {}}},
-          xAxis: { type: 'category', boundaryGap: true, data: this.dateList },
-          yAxis: { type: 'value' },
-          series: this.numList
-        })
-        echarts.init(document.getElementById('barShow')).setOption({
-          title: { text: 'bug状态汇总', x: 'center' },
-          color: ['#003366', '#006699', '#4cabce', '#e5323e'],
-          tooltip: { trigger: 'axis' },
-          legend: { top: 30, data: this.statusMap },
-          grid: { left: '5%', right: '25%', bottom: '12%', containLabel: true },
-          xAxis: [{ data: this.statusList }],
-          yAxis: [{}],
-          series: this.statusMap
+          echarts.init(document.getElementById('lineShow')).setOption({
+            title: { left: 'center', text: 'bug数量汇总' },
+            tooltip: { trigger: 'axis' },
+            legend: { top: 30, data: this.bugName },
+            grid: { left: '5%', right: '25%', bottom: '12%', containLabel: true },
+            // toolbox: { feature: { saveAsImage: {}}},
+            xAxis: { type: 'category', boundaryGap: true, data: this.dateList },
+            yAxis: { type: 'value' },
+            series: this.numList
+          })
+          echarts.init(document.getElementById('barShow')).setOption({
+            title: { text: 'bug状态汇总', x: 'center' },
+            color: ['#003366', '#006699', '#4cabce', '#e5323e'],
+            tooltip: { trigger: 'axis' },
+            legend: { top: 30, data: this.statusMap },
+            grid: { left: '5%', right: '25%', bottom: '12%', containLabel: true },
+            xAxis: [{ data: this.statusList }],
+            yAxis: [{}],
+            series: this.statusMap
+          })
         })
       })
     },

src/views/projectManage/projectList/projectCreate.vue

@@ -29,7 +29,7 @@
             </el-form-item>
           </div>
           <div class="line-between">
-            <el-form-item label="进展" prop="stage" label-width="124px">
+            <el-form-item label="进展" label-width="124px">
               <el-select v-model="form.stage" placeholder="请选择" style="width:76%;">
                 <el-option v-for="item in stageStrings" :key="item.code" :label="item.name" :value="item.code" />
               </el-select>
@@ -47,8 +47,7 @@
           <el-form-item label="需求文档" label-width="110px"><el-input v-model="form.mrdUrl" placeholder="请填写" style="width:90%;" /></el-form-item>
           <el-form-item label="描述" label-width="110px"><el-input v-model="form.description" type="textarea" placeholder="请填写" rows="3" style="width:90%;" /></el-form-item>
           <el-form-item label="详细信息" label-width="110px">
-            <div id="wangeditor" class="force-height" style="margin-bottom:22px;width:90%;height:20px" />
-            <el-input id="divide" v-model="editorContent" type="textarea" rows="3" style="width:90%;" />
+            <div id="wangeditor" class="force-height" style="margin-bottom:22px;width:90%;" />
           </el-form-item>
           <el-form-item label="备注" label-width="110px"><el-input v-model="form.remarks" type="textarea" placeholder="请填写" rows="3" style="width:90%;" /></el-form-item>
           <el-form-item class="submit">
@@ -87,8 +86,8 @@ export default {
         platForm: [{ required: true, message: '平台类型不能为空', trigger: 'change' }],
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
         name: [{ required: true, message: '项目名称不能为空', trigger: 'change' }],
-        priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
-        stage: [{ required: true, message: '进展不能为空', trigger: 'change' }]
+        priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }]
+        // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }]
       }
     }
   },
@@ -102,7 +101,7 @@ export default {
   },
   mounted() {
     if (!this.$route.query.id) {
-      const editor = new E('#wangeditor', 'divide')
+      const editor = new E('#wangeditor')
       editor.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
       editor.customConfig.onchange = (html) => {
         this.editorContent = html
@@ -135,7 +134,6 @@ export default {
           const editor = new E('#wangeditor')
           editor.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
           editor.customConfig.onchange = (html) => {
-            console.log(html)
             this.editorContent = html
           }
           editor.create()
@@ -217,7 +215,8 @@ export default {
     .block-flex >>> .el-form-item__content
       width 100%
     .force-height >>> .w-e-text-container
-      height 80px !important
+      height auto !important
+      min-height 110px !important
     .line-between
       width 100%
       display flex

src/views/projectManage/projectList/projectPreview.vue

@@ -350,7 +350,7 @@ export default {
     },
     // 新建准出报告
     createReport(ele) {
-      if (ele.platForm !== '服务端') {
+      if (ele.platFormString !== '服务端') {
         this.$router.push({ path: '/Platform/presentation/ClientAcceptance', query: { projectId: ele }}) // 客户端
       } else {
         this.$router.push({ path: '/Platform/presentation/Acceptance', query: { projectId: ele }}) // 服务端
@@ -431,6 +431,8 @@ export default {
       display flex
       width 100%
       margin 30px 0 15px 0
+      .add-border
+        margin-top 15px
       .add-border >>> table
         border-collapse collapse
       .add-border >>> table tr td

src/views/projectManage/taskList/taskCreate.vue

@@ -29,7 +29,7 @@
             </el-form-item>
           </div>
           <div class="line-between">
-            <el-form-item label="进展" prop="stage" label-width="124px">
+            <el-form-item label="进展" label-width="124px">
               <el-select v-model="form.stage" style="width:76%;" placeholder="请选择">
                 <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.code" />
               </el-select>
@@ -148,7 +148,7 @@ export default {
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
         name: [{ required: true, message: '任务名称不能为空', trigger: 'change' }],
         priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
-        stage: [{ required: true, message: '进展不能为空', trigger: 'change' }],
+        // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }],
         clientType: [{ required: true, message: '工程模块为空', trigger: 'change' }]
       }
     }

src/views/projectManage/taskList/taskListIndex.vue

@@ -9,7 +9,7 @@
               <el-form :model="form">
                 <div class="set-between">
                   <!-- <el-form-item label="创建时间" label-width="70px"><el-date-picker v-model="form.createTime" align="left" size="medium" type="datetime" style="width:76%;" placeholder="选择日期" /></el-form-item> -->
-                  <el-form-item label="项目名称" label-width="70px"><el-input v-model="form.name" placeholder="请选择项目" autocomplete="off" clearable size="medium" style="width:76%;" /></el-form-item>
+                  <el-form-item label="任务名称" label-width="70px"><el-input v-model="form.name" placeholder="请选择项目" autocomplete="off" clearable size="medium" style="width:76%;" /></el-form-item>
                   <el-form-item label="状态" label-width="40px">
                     <el-select v-model="form.status" size="medium" style="width:60%;" clearable placeholder="状态">
                       <el-option v-for="item in processStatusEnumList" :key="item.code" :label="item.name" :value="item.code" />
@@ -35,7 +35,7 @@
                     width="80"
                   />
                   <el-table-column
-                    label="项目名称"
+                    label="任务名称"
                     align="center"
                     width="200"
                   >

src/views/projectManage/taskList/taskPreview.vue

@@ -250,6 +250,15 @@
         </div>
         <div class="display-messege">
           <div class="divide-twoparts"><span style="font-weight:bold;">计划上线时间 :</span>&nbsp;&nbsp;&nbsp;{{ form.onlinePlanTime }}</div>
+          <div class="divide-twoparts"><span style="font-weight:bold;">冒烟测试完成时间 :</span>&nbsp;&nbsp;&nbsp;{{ form.smokeTestFinishTime }}</div>
+        </div>
+        <div class="display-messege">
+          <div class="divide-twoparts"><span style="font-weight:bold;">实际提测时间 :</span>&nbsp;&nbsp;&nbsp;{{ form.launchTestRealTime }}</div>
+          <div class="divide-twoparts"><span style="font-weight:bold;">实际上线时间 :</span>&nbsp;&nbsp;&nbsp;{{ form.onlineRealTime }}</div>
+        </div>
+        <div class="display-messege">
+          <div class="divide-twoparts"><span style="font-weight:bold;">实际开始开发时间 :</span>&nbsp;&nbsp;&nbsp;{{ form.startDevRealTime }}</div>
+          <div class="divide-twoparts"><span style="font-weight:bold;">实际测试完成时间 :</span>&nbsp;&nbsp;&nbsp;{{ form.testFinishRealTime }}</div>
         </div>
         <div class="display-messege">
           <div class="divide-fullparts"><span style="font-weight:bold;">备注 :</span>&nbsp;&nbsp;&nbsp;{{ form.remark }}</div>

src/views/projectManage/taskList/taskUpdateCreate.vue

@@ -29,7 +29,7 @@
             </el-form-item>
           </div>
           <div class="line-between">
-            <el-form-item label="进展" prop="stage" label-width="124px">
+            <el-form-item label="进展" label-width="124px">
               <el-select v-model="form.stage" style="width:76%;" placeholder="请选择">
                 <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.code" />
               </el-select>
@@ -148,7 +148,7 @@ export default {
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
         name: [{ required: true, message: '任务名称不能为空', trigger: 'change' }],
         priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
-        stage: [{ required: true, message: '进展不能为空', trigger: 'change' }],
+        // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }],
         clientType: [{ required: true, message: '工程模块为空', trigger: 'change' }]
       }
     }