优化准出报告（获取数据调用接口，不直接拿表格数据）

src/apiConfig/api.js

@@ -1,6 +1,6 @@
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
-// export const mockUrl = 'http://10.179.24.176:8980' // 线下
-export const mockUrl = 'http://10.179.24.123:8980' // 线上
+export const mockUrl = 'http://10.179.24.176:8980' // 线下
+// export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
 // export const mockUrl = 'http://172.23.162.226:8980' // 舒宁本地
 

src/views/Platform/presentation/Acceptance.vue

@@ -174,7 +174,7 @@
         <div id="editorNine1" class="text" />
 
         <dir align="right" style="display: flex; margin: 5vw 0 0 50vw;">
-          <div style="flex: 1;"><el-button @click="clickPreview(ClientData)"> 预 览 </el-button></div>
+          <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(ClientData)"> 预 览 </el-button></div>
           <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(ClientData, tableData)"> 保 存 </el-button></div>
           <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(ClientData, tableData)"> 更 新 </el-button></div>
           <div style="flex: 1;"><el-button @click="open()"> 取 消 </el-button></div>
@@ -186,6 +186,7 @@
 
 <script>
 import { projectTestReportUpdate, projectTestReportCreate, bugFinishList } from '@/api/ResultPage'
+import { projectTestReport } from '@/api/testPresentetion'
 import E from 'wangeditor'
 export default {
   name: 'Acceptance',
@@ -214,6 +215,7 @@ export default {
       fctResultChange2: 'info',
       getInfoBtn: 'info',
       getInfoBtn1: 'info',
+      preview: false,
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       serviceDataRules: {
@@ -327,7 +329,6 @@ export default {
     this.editorSix.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
     this.editorEight.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
     this.editorNine.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-    this.getRouterData1()
   },
   methods: {
     getRouterData() {
@@ -359,122 +360,135 @@ export default {
       if (this.$route.query.data) { // 报告主页更新
         this.showButton1 = true
         this.showButton = false
-        this.ClientData = this.$route.query.data
-        this.bugNum = { type: 1, taskId: this.ClientData.taskId, projectId: this.ClientData.projectId }
-        if (this.ClientData.status === 1) {
-          this.tagBtn = 'success'
-          this.status = '1'
-        } else {
-          this.tagBtn1 = 'danger'
-          this.status = '2'
-        }
-        if (this.ClientData.taskLateStatus === 1) {
-          this.tagChange = 'success'
-          this.taskLateStatus = '1'
-          this.showDelay = false
-        } else {
-          this.tagChange1 = 'danger'
-          this.taskLateStatus = '2'
-          this.showDelay = true
-        }
+        this.preview = true
+        projectTestReport({ id: this.$route.query.id }).then((res) => {
+          this.ClientData = res.data
+          this.editorElem.txt.html(this.ClientData.projectBackground)
+          this.editorElems.txt.html(this.ClientData.moduleInfo)
+          this.editorFrom.txt.html(this.ClientData.functionInfo)
+          this.editorF.txt.html(this.ClientData.onlineRisk)
+          this.editorEle.txt.html(this.ClientData.rqtInfo)
+          this.editorEl.txt.html(this.ClientData.fctInfo)
+          this.editorSix.txt.html(this.ClientData.pftInfo)
+          this.editorEight.txt.html(this.ClientData.safeResultInfo)
+          this.editorNine.txt.html(this.ClientData.moniterResultInfo)
+
+          this.bugNum = { type: 1, taskId: this.$route.query.taskId, projectId: this.$route.query.projectId }
+          if (this.ClientData.status === 1) {
+            this.tagBtn = 'success'
+            this.status = '1'
+          } else {
+            this.tagBtn1 = 'danger'
+            this.status = '2'
+          }
+          if (this.ClientData.taskLateStatus === 1) {
+            this.tagChange = 'success'
+            this.taskLateStatus = '1'
+            this.showDelay = false
+          } else {
+            this.tagChange1 = 'danger'
+            this.taskLateStatus = '2'
+            this.showDelay = true
+          }
 
-        if (this.ClientData.safeInfo !== '') {
-          this.getInfoBtn1 = 'info'
-          this.getInfoBtn = 'danger'
-          this.lateStatus = 2
-          this.showData = true
-        } else {
-          this.getInfoBtn1 = 'success'
-          this.getInfoBtn = 'info'
-          this.lateStatus = 1
-          this.showData = false
-          this.$set(this.ClientData, 'safeInfo', '')
-        }
+          if (this.ClientData.safeInfo !== '') {
+            this.getInfoBtn1 = 'info'
+            this.getInfoBtn = 'danger'
+            this.lateStatus = 2
+            this.showData = true
+          } else {
+            this.getInfoBtn1 = 'success'
+            this.getInfoBtn = 'info'
+            this.lateStatus = 1
+            this.showData = false
+            this.$set(this.ClientData, 'safeInfo', '')
+          }
 
-        if (this.ClientData.fctResult) { // 功能测试
-          switch (this.ClientData.fctResult) {
-            case 1:
-              this.fctResultChange1 = 'success'
-              this.fctResult = 1
-              break
-            case 2:
-              this.fctResultChange2 = 'danger'
-              this.fctResult = 2
-              break
-            case 3:
-              this.fctResultChange = 'warning'
-              this.fctResult = 3
-              break
+          if (this.ClientData.fctResult) { // 功能测试
+            switch (this.ClientData.fctResult) {
+              case 1:
+                this.fctResultChange1 = 'success'
+                this.fctResult = 1
+                break
+              case 2:
+                this.fctResultChange2 = 'danger'
+                this.fctResult = 2
+                break
+              case 3:
+                this.fctResultChange = 'warning'
+                this.fctResult = 3
+                break
+            }
           }
-        }
 
-        if (this.ClientData.rqtResult) { // 可靠性测试
-          switch (this.ClientData.rqtResult) {
-            case 1:
-              this.rqtResultChange1 = 'success'
-              this.rqtResult = 1
-              break
-            case 2:
-              this.rqtResultChange2 = 'danger'
-              this.rqtResult = 2
-              break
-            case 3:
-              this.rqtResultChange = 'warning'
-              this.rqtResult = 3
-              break
+          if (this.ClientData.rqtResult) { // 可靠性测试
+            switch (this.ClientData.rqtResult) {
+              case 1:
+                this.rqtResultChange1 = 'success'
+                this.rqtResult = 1
+                break
+              case 2:
+                this.rqtResultChange2 = 'danger'
+                this.rqtResult = 2
+                break
+              case 3:
+                this.rqtResultChange = 'warning'
+                this.rqtResult = 3
+                break
+            }
           }
-        }
 
-        if (this.ClientData.pftResult) { // 稳定性测试
-          switch (this.ClientData.pftResult) {
-            case 1:
-              this.pftResultChange1 = 'success'
-              this.pftResult = 1
-              break
-            case 2:
-              this.pftResultChange2 = 'danger'
-              this.pftResult = 2
-              break
-            case 3:
-              this.pftResultChange = 'warning'
-              this.pftResult = 3
-              break
+          if (this.ClientData.pftResult) { // 稳定性测试
+            switch (this.ClientData.pftResult) {
+              case 1:
+                this.pftResultChange1 = 'success'
+                this.pftResult = 1
+                break
+              case 2:
+                this.pftResultChange2 = 'danger'
+                this.pftResult = 2
+                break
+              case 3:
+                this.pftResultChange = 'warning'
+                this.pftResult = 3
+                break
+            }
           }
-        }
 
-        if (this.ClientData.safeResult) { // 安全性测试
-          switch (this.ClientData.safeResult) {
-            case 1:
-              this.safeResultChange1 = 'success'
-              this.safeResult = 1
-              break
-            case 2:
-              this.safeResultChange2 = 'danger'
-              this.safeResult = 2
-              break
-            case 3:
-              this.safeResultChange = 'warning'
-              this.safeResult = 3
-              break
+          if (this.ClientData.safeResult) { // 安全性测试
+            switch (this.ClientData.safeResult) {
+              case 1:
+                this.safeResultChange1 = 'success'
+                this.safeResult = 1
+                break
+              case 2:
+                this.safeResultChange2 = 'danger'
+                this.safeResult = 2
+                break
+              case 3:
+                this.safeResultChange = 'warning'
+                this.safeResult = 3
+                break
+            }
           }
-        }
 
-        if (this.ClientData.moniterResult) { // 线上监控
-          switch (this.ClientData.moniterResult) {
-            case 1:
-              this.moniterResultChange1 = 'success'
-              this.moniterResult = 1
-              break
-            case 2:
-              this.moniterResultChange2 = 'danger'
-              this.moniterResult = 2
-              break
-            case 3:
-              this.moniterResultChange = 'warning'
-              this.moniterResult = 3
-              break
+          if (this.ClientData.moniterResult) { // 线上监控
+            switch (this.ClientData.moniterResult) {
+              case 1:
+                this.moniterResultChange1 = 'success'
+                this.moniterResult = 1
+                break
+              case 2:
+                this.moniterResultChange2 = 'danger'
+                this.moniterResult = 2
+                break
+              case 3:
+                this.moniterResultChange = 'warning'
+                this.moniterResult = 3
+                break
+            }
           }
-        }
+        })
       }
       this.getBugData(this.bugNum)
     },
@@ -497,28 +511,6 @@ export default {
         }
       })
     },
-    // celledit(row, column, cell, event) {
-    //   if (row[column.property]) {
-    //     row[column.property].edit = true
-    //     setTimeout(() => {
-    //       this.$refs[column.property].focus()
-    //     }, 20)
-    //   }
-    // },
-    getRouterData1() {
-      if (this.$route.query.data) {
-        this.ClientData = this.$route.query.data
-        this.editorElem.txt.html(this.ClientData.projectBackground)
-        this.editorElems.txt.html(this.ClientData.moduleInfo)
-        this.editorFrom.txt.html(this.ClientData.functionInfo)
-        this.editorF.txt.html(this.ClientData.onlineRisk)
-        this.editorEle.txt.html(this.ClientData.rqtInfo)
-        this.editorEl.txt.html(this.ClientData.fctInfo)
-        this.editorSix.txt.html(this.ClientData.pftInfo)
-        this.editorEight.txt.html(this.ClientData.safeResultInfo)
-        this.editorNine.txt.html(this.ClientData.moniterResultInfo)
-      }
-    },
     open(ele) {
       this.$confirm('是否放弃修改，离开页面？', '确认信息', {
         distinguishCancelAndClose: true,
@@ -614,7 +606,7 @@ export default {
       })
     },
     clickPreview(ele) {
-      this.$router.push({ path: '/Platform/presentation/ResultPageyL', query: { data: ele }})
+      this.$router.push({ path: '/Platform/presentation/ResultPageyL', query: { id: this.$route.query.id }})
     },
 
     // 准出延期

src/views/Platform/presentation/Assumptions.vue

@@ -107,8 +107,6 @@ export default {
         } else {
           this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
         }
-        // this.tableData = res.data
-        // this.total = res.total
       })
     },
     // 删除报告
@@ -141,9 +139,9 @@ export default {
       }
     },
 
-    // 创建B端，服务端，客户端跳转
     // 创建B端，服务端，客户端跳转
     selectionReport(e) {
+      console.log(e)
       if (this.queryData.state !== '') {
         for (var ele of this.restaurants) {
           if (ele.id === e.state) {
@@ -157,7 +155,9 @@ export default {
             this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: this.data_type }})
           }
         } else {
-          this.$message({ message: '请选择想要创建服务端还是客户端', type: 'success', duration: 1000, offset: 150 })
+          if (this.DuanKopu === true) {
+            this.$message({ message: '请选择想要创建服务端还是客户端', type: 'success', duration: 1000, offset: 150 })
+          }
         }
         if (this.DuanKopu === false) {
           if (this.data_type.type === 5) {

src/views/Platform/presentation/ClientAcceptance.vue

@@ -128,7 +128,7 @@
         </el-row>
 
         <div align="right" style="display: flex; margin: 5vw 0 3vw 50vw;">
-          <div style="flex: 1;"><el-button @click="clickPreview(ClientData)"> 预 览 </el-button></div>
+          <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(ClientData)"> 预 览 </el-button></div>
           <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(ClientData, tableData)"> 保 存 </el-button></div>
           <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(ClientData, tableData)"> 更 新 </el-button></div>
           <div style="flex: 1;"><el-button @click="open()"> 取 消 </el-button></div>
@@ -139,7 +139,8 @@
 </template>
 
 <script>
-import { projectTestReportUpdate, projectTestReportCreate, bugFinishList, projectTestReportList } from '@/api/ResultPage'
+import { projectTestReportUpdate, projectTestReportCreate, bugFinishList } from '@/api/ResultPage'
+import { projectTestReport } from '@/api/testPresentetion'
 import E from 'wangeditor'
 export default {
   name: 'ClientAcceptance',
@@ -160,6 +161,7 @@ export default {
       acceptanceResultChange: 'info',
       acceptanceResultChange1: 'info',
       acceptanceResultChange2: 'info',
+      preview: false,
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       serviceDataRules: {
@@ -227,7 +229,6 @@ export default {
     this.editorElems.txt.html(`<p></p><table width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>页面</th><th>模块</th><th>接口</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
     this.editorFrom.txt.html(`<p>1、机型兼容</p><table width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>手机型号</th><th>操作系统</th><th>分辨率</th><th>（微信版本号）</tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p>2、网络兼容</p><table width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>WIFI</th><th>4G</th><th>5G</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table><p>3、容器兼容</p><br>`)
     this.editorFro.txt.html(`<p></p><table width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>验收项</th><th>验收点</th><th>验收人</th><th>验收结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-    this.getRouterData1()
   },
   methods: {
     getRouterData() {
@@ -256,110 +257,103 @@ export default {
       }
 
       if (this.$route.query.data) { // 准出主页面
-        projectTestReportList({ bizId: this.$route.query.data.bizId }).then(res => {
-          for (var vel of res.data) {
-            this.$route.query.data.id === vel.id
-            var obj = vel
-          }
-          console.log(obj)
-        })
-        this.ClientData = {}
         this.showButton1 = true
         this.showButton = false
-        this.ClientData = this.$route.query.data
-        this.bugNum = { type: 1, taskId: this.ClientData.taskId, projectId: this.ClientData.projectId }
-        if (this.ClientData.status === 1) {
-          this.tagBtn = 'success'
-          this.tagBtn1 = 'info'
-          this.status = 1
-        } else {
-          this.tagBtn1 = 'danger'
-          this.tagBtn = 'info'
-          this.status = 2
-        }
-        if (this.ClientData.taskLateStatus === 1) {
-          this.tagChange = 'success'
-          this.tagChange1 = 'info'
-          this.taskLateStatus = 1
-          this.showDelay = false
-        } else {
-          this.tagChange1 = 'danger'
-          this.tagChange = 'info'
-          this.taskLateStatus = 2
-          this.showDelay = true
-        }
-        if (this.ClientData.sctResult) {
-          switch (this.ClientData.sctResult) {
-            case 1:
-              this.sctChange = 'info'
-              this.sctChange1 = 'success'
-              this.sctChange2 = 'info'
-              this.sctResult = 1
-              break
-            case 2:
-              this.sctChange = 'info'
-              this.sctChange1 = 'info'
-              this.sctChange2 = 'danger'
-              this.sctResult = 2
-              break
-            case 3:
-              this.sctChange = 'warning'
-              this.sctChange1 = 'info'
-              this.sctChange2 = 'info'
-              this.sctResult = 3
+        this.preview = true
+        projectTestReport({ id: this.$route.query.id }).then((res) => {
+          this.ClientData = res.data
+          this.bugNum = { type: 1, taskId: this.ClientData.taskId, projectId: this.ClientData.projectId }
+          if (this.ClientData.status === 1) {
+            this.tagBtn = 'success'
+            this.tagBtn1 = 'info'
+            this.status = 1
+          } else {
+            this.tagBtn1 = 'danger'
+            this.tagBtn = 'info'
+            this.status = 2
           }
-        }
-        if (this.ClientData.pftResult) {
-          switch (this.ClientData.pftResult) {
-            case 1:
-              this.pftChange = 'info'
-              this.pftChange1 = 'success'
-              this.pftChange2 = 'info'
-              this.pftResult = 1
-              break
-            case 2:
-              this.pftChange = 'info'
-              this.pftChange1 = 'info'
-              this.pftChange2 = 'danger'
-              this.pftResult = 2
-              break
-            case 3:
-              this.pftChange = 'warning'
-              this.pftChange1 = 'info'
-              this.pftChange2 = 'info'
-              this.pftResult = 3
+          if (this.ClientData.taskLateStatus === 1) {
+            this.tagChange = 'success'
+            this.tagChange1 = 'info'
+            this.taskLateStatus = 1
+            this.showDelay = false
+          } else {
+            this.tagChange1 = 'danger'
+            this.tagChange = 'info'
+            this.taskLateStatus = 2
+            this.showDelay = true
           }
-        }
-        if (this.ClientData.acceptanceResult) {
-          switch (this.ClientData.acceptanceResult) {
-            case 1:
-              this.acceptanceResultChange = 'info'
-              this.acceptanceResultChange1 = 'success'
-              this.acceptanceResultChange2 = 'info'
-              this.acceptanceResult = 1
-              break
-            case 2:
-              this.acceptanceResultChange = 'info'
-              this.acceptanceResultChange1 = 'info'
-              this.acceptanceResultChange2 = 'danger'
-              this.acceptanceResult = 2
-              break
-            case 3:
-              this.acceptanceResultChange = 'warning'
-              this.acceptanceResultChange1 = 'info'
-              this.acceptanceResultChange2 = 'info'
-              this.acceptanceResult = 3
+          if (this.ClientData.sctResult) {
+            switch (this.ClientData.sctResult) {
+              case 1:
+                this.sctChange = 'info'
+                this.sctChange1 = 'success'
+                this.sctChange2 = 'info'
+                this.sctResult = 1
+                break
+              case 2:
+                this.sctChange = 'info'
+                this.sctChange1 = 'info'
+                this.sctChange2 = 'danger'
+                this.sctResult = 2
+                break
+              case 3:
+                this.sctChange = 'warning'
+                this.sctChange1 = 'info'
+                this.sctChange2 = 'info'
+                this.sctResult = 3
+            }
           }
-        }
+          if (this.ClientData.pftResult) {
+            switch (this.ClientData.pftResult) {
+              case 1:
+                this.pftChange = 'info'
+                this.pftChange1 = 'success'
+                this.pftChange2 = 'info'
+                this.pftResult = 1
+                break
+              case 2:
+                this.pftChange = 'info'
+                this.pftChange1 = 'info'
+                this.pftChange2 = 'danger'
+                this.pftResult = 2
+                break
+              case 3:
+                this.pftChange = 'warning'
+                this.pftChange1 = 'info'
+                this.pftChange2 = 'info'
+                this.pftResult = 3
+            }
+          }
+          if (this.ClientData.acceptanceResult) {
+            switch (this.ClientData.acceptanceResult) {
+              case 1:
+                this.acceptanceResultChange = 'info'
+                this.acceptanceResultChange1 = 'success'
+                this.acceptanceResultChange2 = 'info'
+                this.acceptanceResult = 1
+                break
+              case 2:
+                this.acceptanceResultChange = 'info'
+                this.acceptanceResultChange1 = 'info'
+                this.acceptanceResultChange2 = 'danger'
+                this.acceptanceResult = 2
+                break
+              case 3:
+                this.acceptanceResultChange = 'warning'
+                this.acceptanceResultChange1 = 'info'
+                this.acceptanceResultChange2 = 'info'
+                this.acceptanceResult = 3
+            }
+          }
+          this.editorElem.txt.html(this.ClientData.projectBackground)
+          this.editorElems.txt.html(this.ClientData.fctInfo)
+          this.editorFrom.txt.html(this.ClientData.sctInfo)
+          this.editorFro.txt.html(this.ClientData.acceptanceResultInfo)
+        })
       }
       this.getBugData(this.bugNum)
     },
-    getRouterData1() {
-      this.editorElem.txt.html(this.ClientData.projectBackground)
-      this.editorElems.txt.html(this.ClientData.fctInfo)
-      this.editorFrom.txt.html(this.ClientData.sctInfo)
-      this.editorFro.txt.html(this.ClientData.acceptanceResultInfo)
-    },
     open() {
       this.$confirm('是否放弃修改，离开页面？', '确认信息', {
         distinguishCancelAndClose: true,

src/views/Platform/presentation/ResultPage.vue

@@ -134,10 +134,10 @@ export default {
     queryPresentation(data) {
       switch (data.type) {
         case 1:// 客户端
-          this.$router.push({ path: '/Platform/presentation/ClientAcceptance', query: { data: data }})
+          this.$router.push({ path: '/Platform/presentation/ClientAcceptance', query: { data: data, taskId: data.taskId, projectId: data.projectId, id: data.id }})
           break
         case 2:// 服务端
-          this.$router.push({ path: '/Platform/presentation/Acceptance', query: { data: data }})
+          this.$router.push({ path: '/Platform/presentation/Acceptance', query: { data: data, taskId: data.taskId, projectId: data.projectId, id: data.id }})
           break
       }
     },