Kaynağa Gözat

Merge branch 'http_mock'

qinzhipeng_v 5 yıl önce
ebeveyn
işleme
a91ab63eff

+ 15 - 14
src/views/Platform/presentation/Assumptions.vue

@@ -130,16 +130,18 @@ export default {
         })
     },
     queryPresentation(data) {
+      console.log(data)
       switch (data.type) {
         case 1:// 客户端
-          this.$router.push({ path: '/Platform/presentation/PresentReport', query: { data: data }})
+          this.$router.push({ path: '/Platform/presentation/PresentReport', query: { data: data, taskId: data.taskId, projectId: data.projectId, id: data.id }})
           break
         case 2:// 服务端
-          this.$router.push({ path: '/Platform/presentation/presentationReport', query: { data: data }})
+          this.$router.push({ path: '/Platform/presentation/presentationReport', query: { data: data, taskId: data.taskId, projectId: data.projectId, id: data.id }})
           break
       }
     },
 
+    // 创建B端,服务端,客户端跳转
     // 创建B端,服务端,客户端跳转
     selectionReport(e) {
       if (this.queryData.state !== '') {
@@ -148,23 +150,22 @@ export default {
             this.data_type = ele
           }
         }
-        if (e.radio !== undefined) {
-          if (e.radio) { // B端可以选择创建服务端或客户端
-            if (e.radio === '1') {
-              this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: this.data_type }})
-            } else {
-              this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: this.data_type }})
-            }
+        if (e.radio !== undefined) { // B端可以选择创建服务端或客户端
+          if (e.radio === '1') {
+            this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: this.data_type }})
           } else {
-            if (this.data_type.type === 5) {
-              this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: this.data_type }}) // 服务端
-            } else {
-              this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: this.data_type }}) // 客户端
-            }
+            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 === false) {
+          if (this.data_type.type === 5) {
+            this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: this.data_type }}) // 服务端
+          } else {
+            this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: this.data_type }}) // 客户端
+          }
+        }
       } else {
         this.centerDialogVisible = true
         this.$message({ message: '提示,请选择要添加的任务ID', type: 'warning' })

+ 16 - 52
src/views/Platform/presentation/DailyNewsAdded.vue

@@ -15,15 +15,6 @@
         <!-- 富文本 -->
         <div id="editor" name="editor" style="width:50px;" />
 
-        <!-- <div class="backStyle">一. 进度和风险</div>
-        <div id="projectProgress" class="toolbar" />
-        <div id="projectProgress1" class="text" style="text-align:left" />
-
-        <div class="backStyle">二. 测试情况</div>
-
-        <div id="TestProgress" class="toolbar" />
-        <div id="TestProgress1" class="text" style="text-align:left;" /> -->
-
         <div class="backStyle">三. bug情况</div>
 
         <div style="border: 1px,solid #ccc;">
@@ -39,7 +30,7 @@
           </el-row>
         </div>
         <dir align="right" style="display: flex; margin: 5vw 0 0 50vw;">
-          <div style="flex: 1;"><el-button @click="clickPreview(fromCreateData)"> 预 览 </el-button></div>
+          <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(fromCreateData)"> 预 览 </el-button></div>
           <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(fromCreateData)"> 保 存 </el-button></div>
           <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(fromCreateData)"> 更 新 </el-button></div>
           <div style="flex: 1;"><el-button @click="open(fromCreateData)"> 取 消 </el-button></div>
@@ -53,7 +44,7 @@
 // import E from 'wangeditor'
 import echarts from 'echarts'
 import Jodit from 'jodit'
-import { dailyReportCreate, dailyReportUpdate, bugDailyList } from '@/api/testPresentetion'
+import { dailyReportCreate, dailyReportUpdate, bugDailyList, dailyReport } from '@/api/testPresentetion'
 
 export default {
   name: 'DailyNewsAdded',
@@ -69,6 +60,7 @@ export default {
       showbut: '',
       showButton1: '',
       bugshow: '',
+      preview: false,
       showButton: true,
       fromCreateData: {
         id: '',
@@ -115,40 +107,26 @@ export default {
       'showXPathInStatusbar': false
     })
     this.editor.value = '<br><h2>一. 进度和风险</h2><br><p>1,项目整体进度</p><br><br><p>2,项目风险与问题</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"></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><br><h2>二. 测试情况</h2><br><p>1,测试进展</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"></colgroup><thead><tr><th>标题1</th><th>标题2</th><th>标题3</th><th>标题4</th><th>标题5</th><th>标题6</th><th>标题7</th></tr></thead><tbody><tr><td><br></td><td><br></td><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><td><br></td><td><br></td></tr></tbody></table><br><p>2,测试说明</p><br><br>'
-    // this.TestProgress = new E('#TestProgress', '#TestProgress1')
-    // this.projectProgress = new E('#projectProgress', '#projectProgress1')
-
-    // this.TestProgress.customConfig.zIndex = 110
-    // this.projectProgress.customConfig.zIndex = 110
-
-    // this.TestProgress.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    // this.projectProgress.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-
-    // this.TestProgress.customConfig.onchange = (html) => { this.TestProgress = html }
-    // this.projectProgress.customConfig.onchange = (html) => { this.projectProgress = html }
-
-    // this.TestProgress.create()
-    // this.projectProgress.create()
-
-    // this.TestProgress.txt.html(`<p>1,测试进展</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"></colgroup><thead><tr><th>标题1</th><th>标题2</th><th>标题3</th><th>标题4</th><th>标题5</th><th>标题6</th><th>标题7</th></tr></thead><tbody><tr><td><br></td><td><br></td><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><td><br></td><td><br></td></tr></tbody></table><br><p>2,测试说明</p><br><br>`)
-    // this.projectProgress.txt.html(`<br><p>1,项目整体进度</p><br><br><p>2,项目风险与问题</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"></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><br>`)
-    this.getRouterData1()
   },
   methods: {
     getRouterData() {
-      if (this.$route.query.data) {
+      if (this.$route.query.data) { // 主页面编辑
         this.fromCreateData = {}
-        this.fromCreateData = this.$route.query.data
         this.showButton1 = true
         this.showButton = false
-        this.pro = this.$route.query.data
+        this.preview = true
+        dailyReport({ id: this.$route.query.id }).then((res) => {
+          this.fromCreateData = res.data
+          this.editor.value = this.fromCreateData.testExplain
+        })
+        this.pro = { projectId: this.$route.query.projectId, taskId: this.$route.query.taskId }
       }
       if (this.$route.query.state1) { // 项目主页面新建
         this.fromCreateData = {}
         this.showButton1 = false
         this.showButton = true
-        this.projectId = this.$route.query.state1.projectId
-        this.taskId = this.$route.query.state1.taskId
+        this.$route.query.projectId ? this.projectId = this.$route.query.projectId : ''
+        this.$route.query.taskId ? this.taskId = this.$route.query.taskId : ''
         this.bizIdCode = this.$route.query.state1.bizId
         this.pro = { projectId: this.projectId, taskId: this.taskId }
       }
@@ -157,15 +135,15 @@ export default {
         this.showButton1 = false
         this.showButton = true
         this.bizIdCode = this.$route.query.task.bizId
-        this.idCode = this.$route.query.task.id
+        this.$route.query.taskId ? this.idCode = this.$route.query.taskId : ''
         this.pro = { taskId: this.idCode }
       }
-      if (this.$route.query.projectId) { // 项目页面
+      if (this.$route.query.project) { // 项目页面
         this.fromCreateData = {}
         this.showButton1 = false
         this.showButton = true
         this.bizIdCode = this.$route.query.projectId.bizId
-        this.idCode = this.$route.query.projectId.id
+        this.$route.query.projectId ? this.idCode = this.$route.query.projectId : ''
         this.pro = { projectId: this.idCode }
       }
 
@@ -198,9 +176,6 @@ export default {
         })
       })
     },
-    getRouterData1() {
-      this.editor.value = this.fromCreateData.testExplain
-    },
 
     // 返回
     open(ele) {
@@ -218,10 +193,7 @@ export default {
       this.$refs['fromCreateData'].validate((valid) => {
         if (valid) {
           this.fromCreateData = ele
-          // typeof (this.TestProgress) === 'string' ? this.fromCreateData.testExplain = this.TestProgress : ''
           this.fromCreateData.testExplain = this.editor.editor.innerHTML
-          // typeof (this.projectProgress) === 'string' ? this.fromCreateData.problemRisks = this.projectProgress : ''
-          // this.fromCreateData.taskId !== '' ? this.fromCreateData.taskId = this.idCode : this.fromCreateData.projectId = this.idCode
           if (this.$route.query.task) { // 任务页面
             this.fromCreateData.taskId = this.idCode
             this.fromCreateData.bizId = this.bizIdCode
@@ -256,12 +228,9 @@ export default {
 
     // 更新bug提交
     getQueryData(ele) {
-      debugger
-      console.log(ele)
       this.fromCreateData = ele
       this.fromCreateData.taskId === 0 ? this.fromCreateData.taskId = '' : ''
       this.fromCreateData.projectId === 0 ? this.fromCreateData.projectId = '' : ''
-      // typeof (this.TestProgress) === 'string' ? this.fromCreateData.testExplain = this.testExplain : ''
       this.fromCreateData.testExplain = this.editor.editor.innerHTML
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.objData = { dailyTestReport: this.fromCreateData, user: this.userData }
@@ -277,7 +246,7 @@ export default {
 
     // 预览跳转
     clickPreview(ele) {
-      this.$router.push({ path: '/Platform/presentation/testPresenyL', query: { data: ele }})
+      this.$router.push({ path: '/Platform/presentation/testPresenyL', query: { id: this.$route.query.id }})
     },
 
     deleteProject(e) {
@@ -288,9 +257,6 @@ export default {
         this.showbut1 = false
         this.showbut = '2'
       }
-    },
-    createDateNode() {
-
     }
   }
 }
@@ -314,11 +280,9 @@ export default {
     border: none;
   }
   .toolbar {
-    /* width: 86vw; */
     border: 1px solid #DEE2E7;
   }
   .text {
-    /* width: 86vw; */
     border: 1px solid #DEE2E7;
     height: auto;
     font-size: 15px;

+ 43 - 41
src/views/Platform/presentation/PresentReport.vue

@@ -102,7 +102,7 @@
         </div>
 
         <div class="double" align="right" style="margin: 5vw 0 3vw 60vw;">
-          <div><el-button @click="clickPreview(dataChange)"> 预 览 </el-button></div>
+          <div><el-button v-show="preview" @click="clickPreview(dataChange)"> 预 览 </el-button></div>
           <div v-show="showButton"><el-button type="primary" @click="getCreateData(dataChange)"> 保 存 </el-button></div>
           <div v-show="showButton1"><el-button type="primary" @click="getQueryData(dataChange)"> 更 新 </el-button></div>
           <div><el-button @click="open(dataChange)"> 取 消 </el-button></div>
@@ -115,6 +115,7 @@
 
 <script>
 import { launchTestUpdate, launchTestCreate } from '@/api/InterfaceReport'
+import { launchTest } from '@/api/testPresentetion'
 import E from 'wangeditor'
 
 export default {
@@ -147,6 +148,7 @@ export default {
       showApollo: false,
       showRelyOn: false,
       showButton: true,
+      preview: false,
       showButton1: '',
       userData: '',
       objData: '',
@@ -175,7 +177,6 @@ export default {
     this.DetailsOfProposal.customConfig.onchange = (html) => { this.DetailsOfProposal = html }
     this.DetailsOfProposal.create()
     this.DetailsOfProposal.txt.html(`<p></p><table width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>端类型</th><th>联调RD</th><th>联调结果</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></p>`)
-    this.getRouterData1()
   },
   methods: {
     getRouterData() {
@@ -186,43 +187,47 @@ export default {
         this.bizIdCode = this.$route.query.task.bizId
         this.projectIdCode = this.$route.query.task.id
       }
-      if (this.$route.query.data) {
+      if (this.$route.query.data) { // 提测编辑
         this.showButton1 = true
         this.showButton = false
-        this.dataChange = this.$route.query.data
-        if (this.dataChange.lateStatus === 1) {
-          this.lateStatusBtn1 = 'success'
-          this.lateStatusBtn = 'info'
-          this.lateStatus = 1
-          this.showDelay = false
-        } else {
-          this.lateStatusBtn1 = 'info'
-          this.lateStatusBtn = 'danger'
-          this.lateStatus = 2
-          this.showDelay = true
-        }
-        if (this.dataChange.configInfo !== '') {
-          this.configInBtn = 'success'
-          this.configInBtn1 = 'info'
-          this.configIn = 1
-          this.showApollo = true
-        } else {
-          this.configInBtn = 'info'
-          this.configInBtn1 = 'danger'
-          this.configIn = 2
-          this.showApollo = false
-        }
-        if (this.dataChange.dependentComponents !== '') {
-          this.dependentBtn = 'success'
-          this.dependentBtn1 = 'info'
-          this.dependent = 1
-          this.showRelyOn = true
-        } else {
-          this.dependentBtn = 'info'
-          this.dependentBtn1 = 'danger'
-          this.dependent = 2
-          this.showRelyOn = false
-        }
+        this.preview = true
+        launchTest({ id: this.$route.query.id }).then((res) => {
+          this.dataChange = res.data
+          this.DetailsOfProposal.txt.html(this.dataChange.joinTest)
+          if (this.dataChange.lateStatus === 1) {
+            this.lateStatusBtn1 = 'success'
+            this.lateStatusBtn = 'info'
+            this.lateStatus = 1
+            this.showDelay = false
+          } else {
+            this.lateStatusBtn1 = 'info'
+            this.lateStatusBtn = 'danger'
+            this.lateStatus = 2
+            this.showDelay = true
+          }
+          if (this.dataChange.configInfo !== '') {
+            this.configInBtn = 'success'
+            this.configInBtn1 = 'info'
+            this.configIn = 1
+            this.showApollo = true
+          } else {
+            this.configInBtn = 'info'
+            this.configInBtn1 = 'danger'
+            this.configIn = 2
+            this.showApollo = false
+          }
+          if (this.dataChange.dependentComponents !== '') {
+            this.dependentBtn = 'success'
+            this.dependentBtn1 = 'info'
+            this.dependent = 1
+            this.showRelyOn = true
+          } else {
+            this.dependentBtn = 'info'
+            this.dependentBtn1 = 'danger'
+            this.dependent = 2
+            this.showRelyOn = false
+          }
+        })
       }
     },
     getQueryData(ele) {
@@ -268,9 +273,6 @@ export default {
         }
       })
     },
-    getRouterData1() {
-      this.DetailsOfProposal.txt.html(this.dataChange.joinTest)
-    },
     open(ele) {
       this.$confirm('是否放弃修改,离开页面?', '确认信息', {
         distinguishCancelAndClose: true,
@@ -330,7 +332,7 @@ export default {
     },
 
     clickPreview(ele) {
-      this.$router.push({ path: '/Platform/presentation/acceptTheReport', query: { data: ele }})
+      this.$router.push({ path: '/Platform/presentation/acceptTheReport', query: { id: this.$route.query.id }})
     }
   }
 }

+ 30 - 31
src/views/Platform/presentation/presentationReport.vue

@@ -1,5 +1,4 @@
 <template>
-
   <!-- 提测报告,新增服务端报告 -->
   <div class="eleStyle">
     <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 8px; overflow: hidden;">
@@ -111,6 +110,7 @@
 <script>
 import { launchTestUpdate, launchTestCreate } from '@/api/InterfaceReport'
 import E from 'wangeditor'
+import { launchTest } from '@/api/testPresentetion'
 
 export default {
   name: 'PresentationReport',
@@ -177,7 +177,6 @@ export default {
 
     this.editorContent.txt.html(`<p></p><table width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>联调模块</th><th>联调RD</th><th>联调结果</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></p>`)
     this.DetailsOfProposal.txt.html(`<p></p><table width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>提测模块</th><th>提测分支</th><th>对应RD</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></p>`)
-    this.getRouterData1()
   },
   methods: {
     getRouterData() {
@@ -190,36 +189,36 @@ export default {
       if (this.$route.query.data) {
         this.showButton1 = true
         this.showButton = false
-        this.fromDev = this.$route.query.data
-        if (this.fromDev.lateReason !== '') {
-          this.lateStatusBtn1 = 'info'
-          this.lateStatusBtn = 'danger'
-          this.lateStatus = 2
-          this.showDelay = true
-        } else {
-          this.lateStatusBtn1 = 'success'
-          this.lateStatusBtn = 'info'
-          this.lateStatus = 1
-          this.showDelay = false
-        }
-        if (this.fromDev.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.fromDev, 'safeInfo', '')
-        }
+        launchTest({ id: this.$route.query.id }).then((res) => {
+          this.fromDev = res.data
+          if (this.fromDev.lateReason !== '') {
+            this.lateStatusBtn1 = 'info'
+            this.lateStatusBtn = 'danger'
+            this.lateStatus = 2
+            this.showDelay = true
+          } else {
+            this.lateStatusBtn1 = 'success'
+            this.lateStatusBtn = 'info'
+            this.lateStatus = 1
+            this.showDelay = false
+          }
+          if (this.fromDev.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.fromDev, 'safeInfo', '')
+          }
+          this.editorContent.txt.html(this.fromDev.joinTest)
+          this.DetailsOfProposal.txt.html(this.fromDev.moduleInfo)
+        })
       }
     },
-    getRouterData1() {
-      this.editorContent.txt.html(this.fromDev.joinTest)
-      this.DetailsOfProposal.txt.html(this.fromDev.moduleInfo)
-    },
     getQueryData(ele) {
       this.fromDev = ele
       typeof (this.editorContent) === 'string' ? this.fromDev.joinTest = this.editorContent : ''
@@ -302,7 +301,7 @@ export default {
     },
 
     clickPreview(ele) {
-      this.$router.push({ path: '/Platform/presentation/acceptTheReport', query: { data: ele }})
+      this.$router.push({ path: '/Platform/presentation/acceptTheReport', query: { id: this.$route.query.id }})
     }
   }
 }

+ 2 - 3
src/views/Platform/presentation/testPresentation.vue

@@ -134,10 +134,9 @@ export default {
             var type = ele
           }
         }
-        console.log(type)
         this.queryData.state = ''
         this.centerDialogVisible = false
-        this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { state1: type }})
+        this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { state1: type, taskId: type.taskId, projectId: type.projectId }})
       } else {
         this.$message({ type: 'error', message: '请选择任务' })
       }
@@ -153,7 +152,7 @@ export default {
 
     // 日报编辑
     queryPresentation(data) {
-      this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { data: data }})
+      this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { data: data, taskId: data.taskId, projectId: data.projectId, id: data.id }})
     },
     // 切换项目任务
     getQueryData(e) {

+ 1 - 1
src/views/projectManage/projectList/projectListIndex.vue

@@ -226,7 +226,7 @@ export default {
     },
     // 新建日报报告
     createDailyReport(scope) {
-      this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { projectId: scope }})
+      this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { project: scope, projectId: scope.id }})
     },
     // 新建准出报告
     createReport(scope) {

+ 1 - 1
src/views/projectManage/projectList/projectPreview.vue

@@ -347,7 +347,7 @@ export default {
     },
     // 新建日报报告
     createDailyReport(ele) {
-      this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { projectId: ele }})
+      this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { project: ele, projectId: ele.id }})
     },
     // 新建准出报告
     createReport(ele) {

+ 2 - 2
src/views/projectManage/taskList/taskListIndex.vue

@@ -513,7 +513,7 @@ export default {
             this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: ele }}) // 客户端提测
             break
           case 2:
-            this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { task: ele }}) // 客户端日报
+            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 }}) // 客户端准出
@@ -528,7 +528,7 @@ export default {
             this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: ele }}) // 服务端提测
             break
           case 2:
-            this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { task: ele }}) // 服务端日报
+            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 }}) // 服务端准出

+ 2 - 3
src/views/projectManage/taskList/taskPreview.vue

@@ -373,7 +373,6 @@ export default {
     },
 
     create_code(e) {
-      console.log(e.radio)
       if (e.radio !== undefined) {
         if (e.radio === '1') {
           this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: e }}) // 服务端提测
@@ -403,7 +402,7 @@ export default {
             this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: ele }}) // 客户端提测
             break
           case 2:
-            this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { task: ele }}) // 客户端日报
+            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 }}) // 客户端准出
@@ -418,7 +417,7 @@ export default {
             this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: ele }}) // 服务端提测
             break
           case 2:
-            this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { task: ele }}) // 服务端日报
+            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 }}) // 服务端准出