Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

src/views/Platform/presentation/Acceptance.vue

@@ -57,22 +57,22 @@
       <div id="editorElem1" class="text" />
 
       <div class="backStyle">三. 模块信息</div>
-      <div class="titStyle">1、模块信息</div>
+      <div class="titStyle" style="margin: 20px 0;">1、模块信息</div>
 
       <div id="editorElems" class="toolbar" />
       <div id="editorElems1" class="text" />
 
-      <div class="titStyle">2、本期功能</div>
+      <div class="titStyle" style="margin: 20px 0;">2、本期功能</div>
 
       <div id="editorFrom" class="toolbar" />
       <div id="editorFrom1" class="text" />
 
-      <div class="titStyle">3、风险点</div>
+      <div class="titStyle" style="margin: 20px 0;">3、风险点</div>
 
       <div id="editorF" class="toolbar" />
       <div id="editorF1" class="text" />
 
-      <div class="titStyle">4、缺陷分析</div>
+      <div class="titStyle" style="margin: 20px 0;">4、缺陷分析</div>
 
       <el-table :data="tableData" border>
         <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
@@ -107,14 +107,14 @@
         </el-table-column>
       </el-table>
       <el-row>
-        <el-col :span="24"><div class="titStyle">5、遗留问题</div><el-input v-model="ClientData.bugInfo" type="textarea" placeholder="请填写内容" /></el-col>
+        <el-col :span="24"><div class="titStyle" style="margin: 20px 0;">5、遗留问题</div><el-input v-model="ClientData.bugInfo" type="textarea" placeholder="请填写内容" /></el-col>
       </el-row>
 
       <div class="backStyle">四. 测试项</div>
 
-      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
-        <el-form-item style="flex:1; ">1、功能测试</el-form-item>
-        <div style="flex: 1; text-align: right;">
+      <div class="titStyle BJIsize">
+        <el-form-item>1、功能测试</el-form-item>
+        <div class="BJIsize">
           <el-tag :type="fctResultChange" size="small" effect="dark" class="tag" @click="fctResultradio(3)"> 未执行 </el-tag>
           <el-tag :type="fctResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="fctResultradio(1)"> 测试通过 </el-tag>
           <el-tag :type="fctResultChange2" size="small" effect="dark" class="tag" @click="fctResultradio(2)"> 测试未通过 </el-tag>
@@ -124,21 +124,21 @@
       <div id="editorEl" class="toolbar" />
       <div id="editorEl1" class="text" />
 
-      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+      <div class="titStyle BJIsize">
         <el-form-item style="flex:1; ">2、可靠性测试</el-form-item>
-        <div style="flex: 1; text-align: right;">
+        <div class="BJIsize">
           <el-tag :type="rqtResultChange" size="small" effect="dark" class="tag" @click="rqtResultradio(3)"> 未执行 </el-tag>
           <el-tag :type="rqtResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="rqtResultradio(1)"> 测试通过 </el-tag>
-          <el-tag :type="rqtResultChange2" size="small" effect="dark" class="tag" @click="rqtResultradio(2)"> 测试未通过 </el-tag>
+          <el-tag :type="rqtResultChange2" size="small" effect="dark" class="f" @click="rqtResultradio(2)"> 测试未通过 </el-tag>
         </div>
       </div>
 
       <div id="editorEle" class="toolbar" />
       <div id="editorEle1" class="text" />
 
-      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+      <div class="titStyle BJIsize">
         <el-form-item style="flex:1; ">3、稳定性测试</el-form-item>
-        <div style="flex: 1; text-align: right;">
+        <div class="BJIsize">
           <el-tag :type="pftResultChange" size="small" effect="dark" class="tag" @click="pftResultradio(3)"> 未执行 </el-tag>
           <el-tag :type="pftResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="pftResultradio(1)"> 测试通过 </el-tag>
           <el-tag :type="pftResultChange2" size="small" effect="dark" class="tag" @click="pftResultradio(2)"> 测试未通过 </el-tag>
@@ -148,9 +148,9 @@
       <div id="editorSix" class="toolbar" />
       <div id="editorSix1" class="text" />
 
-      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+      <div class="titStyle BJIsize">
         <el-form-item style="flex:1; ">4、安全性测试</el-form-item>
-        <div style="flex: 1; text-align: right;">
+        <div class="BJIsize">
           <el-tag :type="safeResultChange" size="small" effect="dark" class="tag" @click="safeResultradio(3)"> 未执行 </el-tag>
           <el-tag :type="safeResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="safeResultradio(1)"> 测试通过 </el-tag>
           <el-tag :type="safeResultChange2" size="small" effect="dark" class="tag" @click="safeResultradio(2)"> 测试未通过 </el-tag>
@@ -160,9 +160,9 @@
       <div id="editorEight" class="toolbar" />
       <div id="editorEight1" class="text" />
 
-      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+      <div class="titStyle BJIsize">
         <el-form-item style="flex:1; ">5、线上监控</el-form-item>
-        <div style="flex: 1; text-align: right;">
+        <div class="BJIsize">
           <el-tag :type="moniterResultChange" size="small" effect="dark" class="tag" @click="moniterResultradio(3)"> 未执行 </el-tag>
           <el-tag :type="moniterResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="moniterResultradio(1)"> 测试通过 </el-tag>
           <el-tag :type="moniterResultChange2" size="small" effect="dark" class="tag" @click="moniterResultradio(2)"> 测试未通过 </el-tag>
@@ -240,8 +240,6 @@ export default {
       editorSix: '',
       editorEight: '',
       editorNine: '',
-      bizIdCode: '',
-      projectIdCode: '',
       bugNum: {},
       tableData: [],
       fctResult: '',
@@ -323,31 +321,7 @@ export default {
   methods: {
     getRouterData() {
       this.showButton1 = false
-
-      if (this.$route.query.projectId) { // 项目页面新建
-        this.ClientData = {}
-        this.bizIdCode = this.$route.query.projectId.bizId
-        this.projectIdCode = this.$route.query.projectId.id
-        this.bugNum = { type: 1, projectId: this.projectIdCode }
-        this.getBugData()
-      }
-
-      if (this.$route.query.task) { // 任务页面新建
-        this.ClientData = {}
-        this.bizIdCode = this.$route.query.task.bizId
-        this.projectIdCode = this.$route.query.task.id
-        this.bugNum = { type: 1, taskId: this.projectIdCode }
-        this.getBugData()
-      }
-
-      if (this.$route.query.projectData) { // 主页面新建
-        this.ClientData = {}
-        this.bizIdCode = this.$route.query.projectData.bizId
-        this.projectIdCode = this.$route.query.projectData.id
-        this.$route.query.projectData.typeString === 1 ? this.ClientData.projectId = this.projectIdCode : this.ClientData.taskId = this.projectIdCode
-        this.bugNum = { type: 1, taskId: this.ClientData.taskId, projectId: this.ClientData.projectId }
-        this.getBugData()
-      }
+      this.getBugData()
 
       if (this.$route.query.data) { // 报告主页更新
         this.showButton1 = true
@@ -483,7 +457,9 @@ export default {
     },
 
     getBugData() {
-      bugFinishList(this.bugNum).then(res => {
+      var url = location.href // 获取url中"?"符后的字串
+      var arr = url.split('=')
+      bugFinishList({ type: 1, taskId: Number(arr[1]) }).then(res => {
         this.$set(this.ClientData, 'smokeTestResult', res.data.launchInfo)
         this.tableData = [res.data]
         this.formatData()
@@ -567,7 +543,7 @@ export default {
           projectTestReportCreate(this.objData).then(res => {
             if (res.code === 200) {
               this.$message.success(res.msg)
-              this.$emit('quasiExit', res.data)
+              this.$emit('QuasiReport', res.data)
             } else {
               this.$message.error(res.msg)
             }
@@ -749,7 +725,6 @@ export default {
   .titStyle {
     font-size: 15px;
     color:#606266;
-    margin: 20px 0;
   }
   .toolbar {
     border: 1px solid #DEE2E7;
@@ -762,4 +737,9 @@ export default {
     border: 1px solid #DEE2E7;
     height: auto;
   }
+  .BJIsize {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
 </style>

src/views/Platform/presentation/ClientAcceptance.vue

@@ -49,9 +49,9 @@
 
       <div style="margin: 1% 0;" class="backStyle">三. 测试项</div>
 
-      <div style="display:flex; margin:1% 0 -1% 0; white-space: nowrap;">
-        <el-form-item style="flex:1;">1.功能测试</el-form-item>
-        <div style="flex: 1; text-align: right;">
+      <div class="BJIsize">
+        <el-form-item>1.功能测试</el-form-item>
+        <div class="BJIsize">
           <el-tag :type="pftChange" size="small" effect="dark" class="tag" @click="changePftResult(3)"> 未执行 </el-tag>
           <el-tag :type="pftChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="changePftResult(1)"> 测试通过 </el-tag>
           <el-tag :type="pftChange2" size="small" effect="dark" class="tag" @click="changePftResult(2)"> 测试未通过 </el-tag>
@@ -61,9 +61,9 @@
       <div id="editorElems" class="toolbar" />
       <div id="editorElems1" class="text" />
 
-      <div style="display:flex; margin:2% 0 -1% 0;  white-space: nowrap;">
-        <el-form-item style="flex:1;">2.兼容测试</el-form-item>
-        <div style="flex: 1; text-align: right;">
+      <div class="BJIsize">
+        <el-form-item>2.兼容测试</el-form-item>
+        <div class="BJIsize">
           <el-tag :type="sctChange" size="small" effect="dark" class="tag" @click="changeSctResult(3)"> 未执行 </el-tag>
           <el-tag :type="sctChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="changeSctResult(1)"> 测试通过 </el-tag>
           <el-tag :type="sctChange2" size="small" effect="dark" class="tag" @click="changeSctResult(2)"> 测试未通过 </el-tag>
@@ -75,9 +75,9 @@
 
       <div style="margin: 2% 0 0% 0;" class="backStyle">四. 产品验收</div>
 
-      <div style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
-        <el-form-item style="flex:1; ">验收结果</el-form-item>
-        <div style="flex: 1; text-align: right;">
+      <div class="BJIsize">
+        <p>验收结果</p>
+        <div class="BJIsize">
           <el-tag :type="acceptanceResultChange" size="small" effect="dark" class="tag" @click="changeAcceptanceResult(3)"> 未执行 </el-tag>
           <el-tag :type="acceptanceResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="changeAcceptanceResult(1)"> 测试通过 </el-tag>
           <el-tag :type="acceptanceResultChange2" size="small" effect="dark" class="tag" @click="changeAcceptanceResult(2)"> 测试未通过 </el-tag>
@@ -364,6 +364,7 @@ export default {
           projectTestReportCreate(this.objData).then(res => {
             if (res.code === 200) {
               this.$message({ type: 'success', message: '保存成功' })
+              this.$emit('QuasiReport', res.data)
             } else {
               this.$message.error(res.msg)
             }
@@ -515,7 +516,7 @@ export default {
 
 <style scoped>
 .tag {
-     width:60px;
+     width:80px;
      text-align: center;
      cursor:pointer
   }
@@ -540,6 +541,11 @@ export default {
     border: 1px solid #DEE2E7;
     height: auto;
   }
+  .BJIsize {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
 </style>
 <style lang="stylus" scoped>
   .double

src/views/Platform/presentation/ResultPageyL.vue

@@ -1,432 +1,210 @@
 <template>
   <div class="eleStyle">
-    <div style="height:100%;width:98%; margin: 1%; overflow: hidden;">
-      <!-- 准出预览 -->
-      <div v-if="towShow">
-        <div style="padding: 2% 14%;">
-          <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
-            <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ ClientDatayl.reportName }}</span>
-            <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ ClientDatayl.ownner }}
-              <el-button type="primary" size="mini" style="margin:0 2% 0 5%;" @click="dialogTableVisible = true">发送报告</el-button>
-              <el-button size="mini" @click="dialogTableVisible = true">下载测试报告</el-button>
-            </span>
+    <!-- 准出预览 -->
+    <div v-if="towShow">
+      <div style="padding: 2% 12%;">
+        <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
+          <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ ClientDatayl.reportName }}</span>
+          <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ ClientDatayl.ownner }}</span>
+        </div>
+        <div style="margin: 2% 0 1% 0; font-size: 19px; font-weight: bold;">一. 项目概述</div><br>
+        <div style="display:flex;">
+          <div style="flex:1">
+            <div class="marage">测试结果 : <span :style="status1">{{ status }}</span></div><br>
+            <div class="marage">开发人员 : {{ ClientDatayl.developer }}</div><br>
+            <div class="marage">开发周期 : {{ ClientDatayl.devTimeEnd }} 至 {{ ClientDatayl.devTimeStart }}</div><br>
+            <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div><br>
           </div>
-          <div style="margin: 2% 0 1% 0; font-size: 19px; font-weight: bold;">一. 项目概述</div><br>
-          <div style="display:flex;">
-            <div style="flex:1">
-              <div class="marage">测试结果 : <span :style="status1">{{ status }}</span></div><br>
-              <div class="marage">开发人员 : {{ ClientDatayl.developer }}</div><br>
-              <div class="marage">开发周期 : {{ ClientDatayl.devTimeEnd }} 至 {{ ClientDatayl.devTimeStart }}</div><br>
-              <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div><br>
-            </div>
-            <div style="flex:1">
-              <div class="marage">准入结果 : {{ ClientDatayl.launchInfo }}</div><br>
-              <div class="marage">测试人员 : {{ ClientDatayl.tester }}</div><br>
-              <div class="marage">测试周期 : {{ ClientDatayl.testTimeEnd }} 至 {{ ClientDatayl.testTimeStart }} </div><br>
-              <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div><br>
-            </div>
+          <div style="flex:1">
+            <div class="marage">准入结果 : {{ ClientDatayl.launchInfo }}</div><br>
+            <div class="marage">测试人员 : {{ ClientDatayl.tester }}</div><br>
+            <div class="marage">测试周期 : {{ ClientDatayl.testTimeEnd }} 至 {{ ClientDatayl.testTimeStart }} </div><br>
+            <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div><br>
           </div>
-          <div style="display:flex;">
-            <div style="flex:1">
-              <div class="marage">涉及安全项 : <span :style="getInfoBtnDisabled">{{ ClientDatayl.getInfoBtn }}</span></div><br>
-            </div>
-            <div style="flex:1">
-              <div v-show="showData" class="marage">完成结果 : {{ ClientDatayl.safeInfo }}</div>
-            </div>
+        </div>
+        <div style="display:flex;">
+          <div style="flex:1">
+            <div class="marage">涉及安全项 : <span :style="getInfoBtnDisabled">{{ ClientDatayl.getInfoBtn }}</span></div><br>
           </div>
-          <div style="white-space: nowrap;">SDL链接 : <el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></div>
-          <div class="titleStyle">二. 项目背景</div><br>
-
-          <div class="rich" v-html="editorElem" />
+          <div style="flex:1">
+            <div v-show="showData" class="marage">完成结果 : {{ ClientDatayl.safeInfo }}</div>
+          </div>
+        </div>
+        <div style="white-space: nowrap;">SDL链接 : <el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></div>
+        <div class="titleStyle">二. 项目背景</div><br>
+        <div class="rich" v-html="editorElem" />
 
-          <div class="titleStyle">三. 模块信息</div>
+        <div class="titleStyle">三. 模块信息</div>
 
-          <div class="marage">1、模块信息</div>
+        <div class="marage">1、模块信息</div>
 
-          <div class="rich" v-html="editorElems" />
+        <div class="rich" v-html="editorElems" />
 
-          <div class="marage">2、本期功能</div>
+        <div class="marage">2、本期功能</div>
 
-          <div class="rich" v-html="editorFrom" />
+        <div class="rich" v-html="editorFrom" />
 
-          <div class="marage">3、风险点</div>
+        <div class="marage">3、风险点</div>
 
-          <div class="rich" v-html="editorF" />
+        <div class="rich" v-html="editorF" />
 
-          <div class="marage">4、缺陷分析</div>
+        <div class="marage">4、缺陷分析</div>
 
-          <el-table :data="tableData" border>
-            <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
-                <span v-else>{{ scope.row.totalBug.value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
-                <span v-else>{{ scope.row.fixBug.value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
-                <span v-else>{{ scope.row.remainBug.value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="rateOfReopen" min-width="200" align="center" label="reopen率">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.rateOfReopen.edit" ref="rateOfReopen" v-model="scope.row.rateOfReopen.value" style="width: 100%" @blur="scope.row.rateOfReopen.edit = false" />
-                <span v-else>{{ scope.row.rateOfReopen.value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="invalidBug" min-width="200" align="center" label="无效bug数">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.invalidBug.edit" ref="invalidBug" v-model="scope.row.invalidBug.value" style="width: 100%" @blur="scope.row.invalidBug.edit = false" />
-                <span v-else>{{ scope.row.invalidBug.value }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-row>
-            <el-col :span="24"><div style="margin:2% 0;">5、遗留问题</div>{{ ClientDatayl.bugInfo }}</el-col>
-          </el-row>
+        <el-table :data="tableData" border>
+          <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
+              <span v-else>{{ scope.row.totalBug.value }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
+              <span v-else>{{ scope.row.fixBug.value }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
+              <span v-else>{{ scope.row.remainBug.value }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="rateOfReopen" min-width="200" align="center" label="reopen率">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.rateOfReopen.edit" ref="rateOfReopen" v-model="scope.row.rateOfReopen.value" style="width: 100%" @blur="scope.row.rateOfReopen.edit = false" />
+              <span v-else>{{ scope.row.rateOfReopen.value }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="invalidBug" min-width="200" align="center" label="无效bug数">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.invalidBug.edit" ref="invalidBug" v-model="scope.row.invalidBug.value" style="width: 100%" @blur="scope.row.invalidBug.edit = false" />
+              <span v-else>{{ scope.row.invalidBug.value }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-row>
+          <el-col :span="24"><div style="margin:2% 0;">5、遗留问题</div>{{ ClientDatayl.bugInfo }}</el-col>
+        </el-row>
 
-          <div class="rich" v-html="editorData" />
+        <div class="rich" v-html="editorData" />
 
-          <div class="titleStyle">四. 测试项</div>
+        <div class="titleStyle">四. 测试项</div>
 
-          <div class="marage">1、功能测试 : <span style="margin-left:40px;" :style="fctResultChange">{{ fctResult }}</span></div>
+        <div class="marage">1、功能测试 : <span style="margin-left:40px;" :style="fctResultChange">{{ fctResult }}</span></div>
 
-          <div class="rich" v-html="editorEl" />
+        <div class="rich" v-html="editorEl" />
 
-          <div class="marage">2、可靠性测试 : <span style="margin-left:40px;" :style="rqtResultChange">{{ rqtResult }}</span></div>
+        <div class="marage">2、可靠性测试 : <span style="margin-left:40px;" :style="rqtResultChange">{{ rqtResult }}</span></div>
 
-          <div class="rich" v-html="editorEle" />
+        <div class="rich" v-html="editorEle" />
 
-          <div class="marage">3、稳定性测试 : <span style="margin-left:40px;" :style="pftResultChange">{{ pftResult }}</span></div>
+        <div class="marage">3、稳定性测试 : <span style="margin-left:40px;" :style="pftResultChange">{{ pftResult }}</span></div>
 
-          <div class="rich" v-html="editorSix" />
+        <div class="rich" v-html="editorSix" />
 
-          <div class="marage">4、安全性测试 : <span style="margin-left:40px;" :style="safeResultChange">{{ safeResult }}</span></div>
+        <div class="marage">4、安全性测试 : <span style="margin-left:40px;" :style="safeResultChange">{{ safeResult }}</span></div>
 
-          <div class="rich" v-html="editorEight" />
+        <div class="rich" v-html="editorEight" />
 
-          <div class="marage">5、线上监控 : <span style="margin-left:40px;" :style="moniterResultChange">{{ moniterResult }}</span></div>
+        <div class="marage">5、线上监控 : <span style="margin-left:40px;" :style="moniterResultChange">{{ moniterResult }}</span></div>
 
-          <div class="rich" v-html="editorNine" />
-        </div>
+        <div class="rich" v-html="editorNine" />
       </div>
+    </div>
 
-      <div v-if="oneShow">
-        <div id="resumeId1" style="padding: 3% 6%; color: #333B4A;">
-          <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
-            <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ ClientDatayl.reportName }}</span>
-            <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ ClientDatayl.ownner }}
-              <el-button type="primary" size="mini" style="margin:0 2% 0 5%;" @click="dialogTableVisible = true">发送报告</el-button>
-              <el-button size="mini" @click="dialogTableVisible = true">下载测试报告</el-button>
-            </span>
+    <div v-if="oneShow">
+      <div style="padding: 2% 12%;">
+        <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
+          <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ ClientDatayl.reportName }}</span>
+          <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ ClientDatayl.ownner }}</span>
+        </div>
+        <div style="margin: 2% 0 1% 0; font-size: 19px; font-weight: bold;">一、项目概述</div><br>
+        <div style="display:flex;">
+          <div style="flex:1">
+            <div class="marage">测试结果 : <span :style="status1">{{ status }}</span></div><br>
+            <div class="marage">开发人员 : {{ ClientDatayl.developer }}</div><br>
+            <div class="marage">开发周期 : {{ ClientDatayl.devTimeEnd }} 至 {{ ClientDatayl.devTimeStart }}</div><br>
+            <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div><br>
           </div>
-          <div style="margin: 2% 0 1% 0; font-size: 19px; font-weight: bold;">一、项目概述</div><br>
-          <div style="display:flex;">
-            <div style="flex:1">
-              <div class="marage">测试结果 : <span :style="status1">{{ status }}</span></div><br>
-              <div class="marage">开发人员 : {{ ClientDatayl.developer }}</div><br>
-              <div class="marage">开发周期 : {{ ClientDatayl.devTimeEnd }} 至 {{ ClientDatayl.devTimeStart }}</div><br>
-              <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div><br>
-            </div>
-            <div style="flex:1">
-              <div class="marage">准入结果 : {{ ClientDatayl.launchInfo }}</div><br>
-              <div class="marage">测试人员 : {{ ClientDatayl.tester }}</div><br>
-              <div class="marage">测试周期 : {{ ClientDatayl.testTimeEnd }} 至 {{ ClientDatayl.testTimeStart }} </div><br>
-              <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div><br>
-            </div>
+          <div style="flex:1">
+            <div class="marage">准入结果 : {{ ClientDatayl.launchInfo }}</div><br>
+            <div class="marage">测试人员 : {{ ClientDatayl.tester }}</div><br>
+            <div class="marage">测试周期 : {{ ClientDatayl.testTimeEnd }} 至 {{ ClientDatayl.testTimeStart }} </div><br>
+            <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div><br>
           </div>
+        </div>
 
-          <div class="titleStyle">二. 项目背景</div>
+        <div class="titleStyle">二. 项目背景</div>
 
-          <div class="rich" v-html="editorElem1" />
+        <div class="rich" v-html="editorElem" />
 
-          <div class="titleStyle">三. 测试项</div>
+        <div class="titleStyle">三. 测试项</div>
 
-          <p>功能测试 : <span style="margin-left:40px;" :style="pftResult1">{{ pftResult }}</span></p>
+        <p>功能测试 : <span style="margin-left:40px;" :style="pftResult1">{{ pftResult }}</span></p>
 
-          <div class="rich" v-html="editorElems1" />
+        <div class="rich" v-html="editorElems1" />
 
-          <p>兼容测试 : <span style="margin-left:40px;" :style="sctResult1">{{ sctResult }}</span></p>
+        <p>兼容测试 : <span style="margin-left:40px;" :style="sctResult1">{{ sctResult }}</span></p>
 
-          <div class="rich" v-html="editorFrom1" />
+        <div class="rich" v-html="editorFrom1" />
 
-          <div class="titleStyle">四. 产品验收</div>
+        <div class="titleStyle">四. 产品验收</div>
 
-          <p>验收结果 : <span style="margin-left:40px;" :style="acceptanceResult1">{{ acceptanceResult }}</span></p>
+        <p>验收结果 : <span style="margin-left:40px;" :style="acceptanceResult1">{{ acceptanceResult }}</span></p>
 
-          <div class="rich" v-html="editorFro" />
+        <div class="rich" v-html="editorFro" />
 
-          <div class="titleStyle">五. bug指标</div>
+        <div class="titleStyle">五. bug指标</div>
 
-          <el-table :data="tableData" border>
-            <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
-                <span v-else>{{ scope.row.totalBug.value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
-                <span v-else>{{ scope.row.fixBug.value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
-                <span v-else>{{ scope.row.remainBug.value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="rateOfFix" min-width="200" align="center" label="bug解决率">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.rateOfFix.edit" ref="rateOfFix" v-model="scope.row.rateOfFix.value" style="width: 100%" @blur="scope.row.rateOfFix.edit = false" />
-                <span v-else>{{ scope.row.rateOfFix.value }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-row>
-            <el-col :span="24"><div style="margin: 2% 0;">1、遗留问题</div>{{ ClientDatayl.bugInfo }}</el-col>
-          </el-row>
+        <el-table :data="tableData" border>
+          <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
+              <span v-else>{{ scope.row.totalBug.value }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
+              <span v-else>{{ scope.row.fixBug.value }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
+              <span v-else>{{ scope.row.remainBug.value }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="rateOfFix" min-width="200" align="center" label="bug解决率">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.rateOfFix.edit" ref="rateOfFix" v-model="scope.row.rateOfFix.value" style="width: 100%" @blur="scope.row.rateOfFix.edit = false" />
+              <span v-else>{{ scope.row.rateOfFix.value }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-row>
+          <el-col :span="24"><div style="margin: 2% 0;">1、遗留问题</div>{{ ClientDatayl.bugInfo }}</el-col>
+        </el-row>
 
-          <div class="rich" v-html="editorEle1" />
-        </div>
-      </div>
-      <div align="center">
-        <el-button style="margin:02% 0%;" @click="$router.go(-1)"> 返 回 </el-button>
+        <div class="rich" v-html="editorEle1" />
       </div>
     </div>
-
-    <el-dialog title="邮件预览" width="80%" center :visible.sync="dialogTableVisible" @open="idGet()">
-      <div align="center">
-        <el-button type="primary" size="mini" @click="dialogFormVisible_one = true">确定发送</el-button>
-        <el-button size="mini" @click="download()">确定下载</el-button>
-      </div>
-      <div id="resumeId" class="eleStyle">
-        <div style="height:100%;width:94%; background:#ffffff; margin: 3% 3% 8% 3%; border-radius: 4px; overflow: hidden;">
-          <div v-if="towShow">
-            <div style="padding: 3% 9%; color: #333B4A;">
-              <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
-                <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ ClientDatayl.reportName }}</span>
-                <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ ClientDatayl.ownner }}</span>
-              </div>
-              <div style="margin: 2% 0 1% 0; font-size: 19px; font-weight: bold;">一. 项目概述</div><br>
-              <div style="display:flex;">
-                <div style="flex:1">
-                  <div class="marage">测试结果 : <span :style="status1">{{ status }}</span></div><br>
-                  <div class="marage">开发人员 : {{ ClientDatayl.developer }}</div><br>
-                  <div class="marage">开发周期 : {{ ClientDatayl.devTimeEnd }} 至 {{ ClientDatayl.devTimeStart }}</div><br>
-                  <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div><br>
-                </div>
-                <div style="flex:1">
-                  <div class="marage">准入结果 : {{ ClientDatayl.launchInfo }}</div><br>
-                  <div class="marage">测试人员 : {{ ClientDatayl.tester }}</div><br>
-                  <div class="marage">测试周期 : {{ ClientDatayl.testTimeEnd }} 至 {{ ClientDatayl.testTimeStart }} </div><br>
-                  <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div><br>
-                </div>
-              </div>
-              <div style="display:flex;">
-                <div style="flex:1">
-                  <div class="marage">涉及安全项 : <span :style="getInfoBtnDisabled">{{ ClientDatayl.getInfoBtn }}</span></div><br>
-                </div>
-                <div style="flex:1">
-                  <div v-show="showData" class="marage">完成结果 : {{ ClientDatayl.safeInfo }}</div>
-                </div>
-              </div>
-              <div style="white-space: nowrap;">SDL链接 : <el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></div>
-              <div class="titleStyle">二. 项目背景</div><br>
-
-              <div class="rich" v-html="editorElem" />
-
-              <div class="titleStyle">三. 模块信息</div>
-
-              <div class="marage">1、模块信息</div>
-
-              <div class="rich" v-html="editorElems" />
-
-              <div class="marage">2、本期功能</div>
-
-              <div class="rich" v-html="editorFrom" />
-
-              <div class="marage">3、风险点</div>
-
-              <div class="rich" v-html="editorF" />
-
-              <div class="marage">4、缺陷分析</div>
-
-              <el-table :data="tableData" border>
-                <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
-                    <span v-else>{{ scope.row.totalBug.value }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
-                    <span v-else>{{ scope.row.fixBug.value }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
-                    <span v-else>{{ scope.row.remainBug.value }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="rateOfReopen" min-width="200" align="center" label="reopen率">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.rateOfReopen.edit" ref="rateOfReopen" v-model="scope.row.rateOfReopen.value" style="width: 100%" @blur="scope.row.rateOfReopen.edit = false" />
-                    <span v-else>{{ scope.row.rateOfReopen.value }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="invalidBug" min-width="200" align="center" label="无效bug数">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.invalidBug.edit" ref="invalidBug" v-model="scope.row.invalidBug.value" style="width: 100%" @blur="scope.row.invalidBug.edit = false" />
-                    <span v-else>{{ scope.row.invalidBug.value }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-row>
-                <el-col :span="24"><div style="margin:2% 0;">5、遗留问题</div>{{ ClientDatayl.bugInfo }}</el-col>
-              </el-row>
-
-              <div class="rich" v-html="editorData" />
-
-              <div class="titleStyle">四. 测试项</div>
-
-              <div class="marage">1、功能测试 : <span style="margin-left:40px;" :style="fctResultChange">{{ fctResult }}</span></div>
-
-              <div class="rich" v-html="editorEl" />
-
-              <div class="marage">2、可靠性测试 : <span style="margin-left:40px;" :style="rqtResultChange">{{ rqtResult }}</span></div>
-
-              <div class="rich" v-html="editorEle" />
-
-              <div class="marage">3、稳定性测试 : <span style="margin-left:40px;" :style="pftResultChange">{{ pftResult }}</span></div>
-
-              <div class="rich" v-html="editorSix" />
-
-              <div class="marage">4、安全性测试 : <span style="margin-left:40px;" :style="safeResultChange">{{ safeResult }}</span></div>
-
-              <div class="rich" v-html="editorEight" />
-
-              <div class="marage">5、线上监控 : <span style="margin-left:40px;" :style="moniterResultChange">{{ moniterResult }}</span></div>
-
-              <div class="rich" v-html="editorNine" />
-            </div>
-          </div>
-
-          <div v-if="oneShow">
-            <div id="resumeId1" style="padding: 3% 6%; color: #333B4A;">
-              <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
-                <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ ClientDatayl.reportName }}</span>
-                <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ ClientDatayl.ownner }}</span>
-              </div>
-              <div style="margin: 2% 0 1% 0; font-size: 19px; font-weight: bold;">一、项目概述</div><br>
-              <div style="display:flex;">
-                <div style="flex:1">
-                  <div class="marage">测试结果 : <span :style="status1">{{ status }}</span></div><br>
-                  <div class="marage">开发人员 : {{ ClientDatayl.developer }}</div><br>
-                  <div class="marage">开发周期 : {{ ClientDatayl.devTimeEnd }} 至 {{ ClientDatayl.devTimeStart }}</div><br>
-                  <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div><br>
-                </div>
-                <div style="flex:1">
-                  <div class="marage">准入结果 : {{ ClientDatayl.launchInfo }}</div><br>
-                  <div class="marage">测试人员 : {{ ClientDatayl.tester }}</div><br>
-                  <div class="marage">测试周期 : {{ ClientDatayl.testTimeEnd }} 至 {{ ClientDatayl.testTimeStart }} </div><br>
-                  <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div><br>
-                </div>
-              </div>
-
-              <div class="titleStyle">二. 项目背景</div>
-
-              <div class="rich" v-html="editorElem1" />
-
-              <div class="titleStyle">三. 测试项</div>
-
-              <p>功能测试 : <span style="margin-left:40px;" :style="pftResult1">{{ pftResult }}</span></p>
-
-              <div class="rich" v-html="editorElems1" />
-
-              <p>兼容测试 : <span style="margin-left:40px;" :style="sctResult1">{{ sctResult }}</span></p>
-
-              <div class="rich" v-html="editorFrom1" />
-
-              <div class="titleStyle">四. 产品验收</div>
-
-              <p>验收结果 : <span style="margin-left:40px;" :style="acceptanceResult1">{{ acceptanceResult }}</span></p>
-
-              <div class="rich" v-html="editorFro" />
-
-              <div class="titleStyle">五. bug指标</div>
-
-              <el-table :data="tableData" border>
-                <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
-                    <span v-else>{{ scope.row.totalBug.value }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
-                    <span v-else>{{ scope.row.fixBug.value }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
-                    <span v-else>{{ scope.row.remainBug.value }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="rateOfFix" min-width="200" align="center" label="bug解决率">
-                  <template slot-scope="scope">
-                    <el-input v-if="scope.row.rateOfFix.edit" ref="rateOfFix" v-model="scope.row.rateOfFix.value" style="width: 100%" @blur="scope.row.rateOfFix.edit = false" />
-                    <span v-else>{{ scope.row.rateOfFix.value }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-row>
-                <el-col :span="24"><div style="margin: 2% 0;">1、遗留问题</div>{{ ClientDatayl.bugInfo }}</el-col>
-              </el-row>
-
-              <div class="rich" v-html="editorEle1" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-dialog>
-
-    <!-- 发送报告 -->
-    <el-dialog title="发送邮件" width="30%" :visible.sync="dialogFormVisible_one">
-      <el-form label-position="center" :model="form" label-width="80px">
-        <el-form-item label="发送 : ">
-          <el-input v-model="form.name" placeholder="请填写邮箱前缀，邮箱名以 , 分割" />
-        </el-form-item>
-        <el-form-item label="抄送 : ">
-          <el-input v-model="form.names" placeholder="请填写邮箱前缀，邮箱名以 , 分割" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible_one = false">取 消</el-button>
-        <el-button type="primary" @click="sendReport(form)">确 定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { projectTestReportSendmail, bugFinishList } from '@/api/ResultPage'
-import { projectTestReport } from '@/api/testPresentetion'
-import html2canvas from 'html2canvas'
+import { bugFinishList } from '@/api/ResultPage'
+// import { projectTestReportSendmail, bugFinishList } from '@/api/ResultPage'
+// import { projectTestReport } from '@/api/testPresentetion'
 
 export default {
   name: 'ResultPageyL',
+  props: {
+    message: {
+      type: Object,
+      required: true
+    }
+  },
   data() {
     return {
       showDelay1: false,
@@ -442,8 +220,6 @@ export default {
       safeResultChange: { color: '' },
       moniterResultChange: { color: '' },
       showData: false,
-      dialogTableVisible: false,
-      dialogFormVisible_one: false,
       status: '',
       acceptanceResult: '',
       sctResult: '',
@@ -454,7 +230,6 @@ export default {
       showDisabled1: true,
       ClientDatayl: {},
       editorElem: '',
-      editorElem1: '',
       editorElems: '',
       editorElems1: '',
       editorFrom: '',
@@ -473,106 +248,105 @@ export default {
       fctResult: '',
       moniterResult: '',
       rqtResult: '',
-      safeResult: '',
-      form: {}
+      safeResult: ''
     }
   },
   created() {
     this.idGet()
-    // this.getRouterData()
   },
   methods: {
     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
-        this.editorFro = this.ClientDatayl.acceptanceResultInfo
-        this.editorEle1 = this.ClientDatayl.bugTarget
-        this.editorElem = this.ClientDatayl.projectBackground
-        this.editorElems = this.ClientDatayl.moduleInfo
-        this.editorFrom = this.ClientDatayl.functionInfo
-        this.editorF = this.ClientDatayl.onlineRisk
-        this.editorEle = this.ClientDatayl.rqtInfo
-        this.editorData = this.ClientDatayl.bugInfo
-        this.editorEl = this.ClientDatayl.fctInfo
-        this.editorSix = this.ClientDatayl.pftInfo
-        this.editorEight = this.ClientDatayl.safeResultInfo
-        this.editorNine = this.ClientDatayl.moniterResultInfo
-        this.bugNum = { type: this.ClientDatayl.type, taskId: this.ClientDatayl.taskId, projectId: this.ClientDatayl.projectId }
-        if (this.ClientDatayl.type === 2) {
-          this.towShow = true
-          this.oneShow = false
-        } else {
-          this.oneShow = true
-          this.towShow = false
-        }
-        if (this.ClientDatayl.status === 1) {
-          this.status = '通过'
-        } else {
-          this.status = '未通过'
-          this.status1.color = 'red'
-        }
-        if (this.ClientDatayl.taskLateStatus === 1) {
-          this.ClientDatayl.taskLateStatus = '否'
-          this.showDelay1 = false
-          this.taskLateDisabled.color = 'green'
-        } else {
-          this.ClientDatayl.taskLateStatus = '是'
-          this.taskLateDisabled.color = 'red'
-          this.showDelay1 = true
-        }
-        if (this.ClientDatayl.safeInfo !== '') {
-          this.ClientDatayl.getInfoBtn = '是'
-          this.getInfoBtnDisabled.color = 'red'
-          this.showData = true
-        } else {
-          this.ClientDatayl.getInfoBtn = '否'
-          this.getInfoBtnDisabled.color = 'green'
-          this.showData = false
-        }
-        switch (this.ClientDatayl.pftResult) {
-          case 1: this.pftResult = '通过'; this.pftResult1.color = 'green'; break
-          case 2: this.pftResult = '未通过'; this.pftResult1.color = 'red'; break
-          case 3: this.pftResult = '未执行'; this.pftResult1.color = 'Orange'; break
-        }
-        switch (this.ClientDatayl.sctResult) {
-          case 1: this.sctResult = '测试通过'; this.sctResult1.color = 'green'; break
-          case 2: this.sctResult = '测试未通过'; this.sctResult1.color = 'red'; break
-        }
-        switch (this.ClientDatayl.acceptanceResult) {
-          case 1: this.acceptanceResult = '通过'; this.acceptanceResult1.color = 'green'; break
-          case 2: this.acceptanceResult = '未通过'; this.acceptanceResult1.color = 'red'; break
-          case 3: this.acceptanceResult = '未执行'; this.acceptanceResult1.color = 'Orange'; break
-        }
-        switch (this.ClientDatayl.fctResult) { // 功能测试
-          case 1: this.fctResult = '通过'; this.fctResultChange.color = 'green'; break
-          case 2: this.fctResult = '未通过'; this.fctResultChange.color = 'red'; break
-          case 3: this.fctResult = '未执行'; this.fctResultChange.color = 'Orange'; break
-        }
-        switch (this.ClientDatayl.rqtResult) { // 可靠性测试
-          case 1: this.rqtResult = '通过'; this.rqtResultChange.color = 'green'; break
-          case 2: this.rqtResult = '未通过'; this.rqtResultChange.color = 'red'; break
-          case 3: this.rqtResult = '未执行'; this.rqtResultChange.color = 'Orange'; break
-        }
-        switch (this.ClientDatayl.pftResult) { // 稳定性测试
-          case 1: this.pftResult = '通过'; this.pftResultChange.color = 'green'; break
-          case 2: this.pftResult = '未通过'; this.pftResultChange.color = 'red'; break
-          case 3: this.pftResult = '未执行'; this.pftResultChange.color = 'Orange'; break
-        }
-        switch (this.ClientDatayl.safeResult) { // 安全性测试
-          case 1: this.safeResult = '通过'; this.safeResultChange.color = 'green'; break
-          case 2: this.safeResult = '未通过'; this.safeResultChange.color = 'red'; break
-          case 3: this.safeResult = '未执行'; this.safeResultChange.color = 'Orange'; break
-        }
-        switch (this.ClientDatayl.moniterResult) { // 线上监控
-          case 1: this.moniterResult = '通过'; this.moniterResultChange.color = 'green'; break
-          case 2: this.moniterResult = '未通过'; this.moniterResultChange.color = 'red'; break
-          case 3: this.moniterResult = '未执行'; this.moniterResultChange.color = 'Orange'; break
-        }
-        this.getBugData(this.bugNum)
-      })
+      // projectTestReport({ id: this.message.id }).then((res) => {
+      this.ClientDatayl = this.message
+      console.log(this.ClientDatayl, 'ddddddd')
+      // this.editorElem1 = this.ClientDatayl.projectBackground
+      this.editorElems1 = this.ClientDatayl.fctInfo
+      this.editorFrom1 = this.ClientDatayl.sctInfo
+      this.editorFro = this.ClientDatayl.acceptanceResultInfo
+      this.editorEle1 = this.ClientDatayl.bugTarget
+      this.editorElem = this.ClientDatayl.projectBackground
+      this.editorElems = this.ClientDatayl.moduleInfo
+      this.editorFrom = this.ClientDatayl.functionInfo
+      this.editorF = this.ClientDatayl.onlineRisk
+      this.editorEle = this.ClientDatayl.rqtInfo
+      this.editorData = this.ClientDatayl.bugInfo
+      this.editorEl = this.ClientDatayl.fctInfo
+      this.editorSix = this.ClientDatayl.pftInfo
+      this.editorEight = this.ClientDatayl.safeResultInfo
+      this.editorNine = this.ClientDatayl.moniterResultInfo
+      this.bugNum = { type: this.ClientDatayl.type, taskId: this.ClientDatayl.taskIds[0] }
+      if (this.ClientDatayl.type === 2) {
+        this.towShow = true
+        this.oneShow = false
+      } else {
+        this.oneShow = true
+        this.towShow = false
+      }
+      if (this.ClientDatayl.status === 1) {
+        this.status = '通过'
+      } else {
+        this.status = '未通过'
+        this.status1.color = 'red'
+      }
+      if (this.ClientDatayl.taskLateStatus === 1) {
+        this.ClientDatayl.taskLateStatus = '否'
+        this.showDelay1 = false
+        this.taskLateDisabled.color = 'green'
+      } else {
+        this.ClientDatayl.taskLateStatus = '是'
+        this.taskLateDisabled.color = 'red'
+        this.showDelay1 = true
+      }
+      if (this.ClientDatayl.safeInfo !== '') {
+        this.ClientDatayl.getInfoBtn = '是'
+        this.getInfoBtnDisabled.color = 'red'
+        this.showData = true
+      } else {
+        this.ClientDatayl.getInfoBtn = '否'
+        this.getInfoBtnDisabled.color = 'green'
+        this.showData = false
+      }
+      switch (this.ClientDatayl.pftResult) {
+        case 1: this.pftResult = '通过'; this.pftResult1.color = 'green'; break
+        case 2: this.pftResult = '未通过'; this.pftResult1.color = 'red'; break
+        case 3: this.pftResult = '未执行'; this.pftResult1.color = 'Orange'; break
+      }
+      switch (this.ClientDatayl.sctResult) {
+        case 1: this.sctResult = '测试通过'; this.sctResult1.color = 'green'; break
+        case 2: this.sctResult = '测试未通过'; this.sctResult1.color = 'red'; break
+      }
+      switch (this.ClientDatayl.acceptanceResult) {
+        case 1: this.acceptanceResult = '通过'; this.acceptanceResult1.color = 'green'; break
+        case 2: this.acceptanceResult = '未通过'; this.acceptanceResult1.color = 'red'; break
+        case 3: this.acceptanceResult = '未执行'; this.acceptanceResult1.color = 'Orange'; break
+      }
+      switch (this.ClientDatayl.fctResult) { // 功能测试
+        case 1: this.fctResult = '通过'; this.fctResultChange.color = 'green'; break
+        case 2: this.fctResult = '未通过'; this.fctResultChange.color = 'red'; break
+        case 3: this.fctResult = '未执行'; this.fctResultChange.color = 'Orange'; break
+      }
+      switch (this.ClientDatayl.rqtResult) { // 可靠性测试
+        case 1: this.rqtResult = '通过'; this.rqtResultChange.color = 'green'; break
+        case 2: this.rqtResult = '未通过'; this.rqtResultChange.color = 'red'; break
+        case 3: this.rqtResult = '未执行'; this.rqtResultChange.color = 'Orange'; break
+      }
+      switch (this.ClientDatayl.pftResult) { // 稳定性测试
+        case 1: this.pftResult = '通过'; this.pftResultChange.color = 'green'; break
+        case 2: this.pftResult = '未通过'; this.pftResultChange.color = 'red'; break
+        case 3: this.pftResult = '未执行'; this.pftResultChange.color = 'Orange'; break
+      }
+      switch (this.ClientDatayl.safeResult) { // 安全性测试
+        case 1: this.safeResult = '通过'; this.safeResultChange.color = 'green'; break
+        case 2: this.safeResult = '未通过'; this.safeResultChange.color = 'red'; break
+        case 3: this.safeResult = '未执行'; this.safeResultChange.color = 'Orange'; break
+      }
+      switch (this.ClientDatayl.moniterResult) { // 线上监控
+        case 1: this.moniterResult = '通过'; this.moniterResultChange.color = 'green'; break
+        case 2: this.moniterResult = '未通过'; this.moniterResultChange.color = 'red'; break
+        case 3: this.moniterResult = '未执行'; this.moniterResultChange.color = 'Orange'; break
+      }
+      this.getBugData(this.bugNum)
+      // })
     },
     getBugData(e) {
       bugFinishList(e).then(res => {
@@ -591,44 +365,28 @@ export default {
           }
         }
       })
-    },
-    download() {
-      this.getPdf('resumeId', this.name)
-    },
-    download1() {
-      this.getPdf('resumeId1', this.name)
-    },
-    sendReport(e) {
-      var ele = this.ClientDatayl
-      setTimeout(() => {
-        var that = this
-        html2canvas(document.getElementById('resumeId'), { useCORS: true }).then(function(canvas) {
-          var imgData = canvas.toDataURL('image/png')
-          var sendImgData = imgData.substring(imgData.indexOf(',') + 1)
-          var postData = { 'reportId': ele.id, 'imgStr': sendImgData, 'url': window.location.href, 'emailUser': e.name, 'copyTo': e.names }
-          projectTestReportSendmail(postData).then(res => {
-            that.dialogFormVisible_one = false
-            res.code === 200 ? that.$message.success('发送测试报告成功') : that.$message.error('发送测试报告失败，请联系管理员！')
-          })
-        })
-      }, 500)
-    },
-
-    sendReport1(e) {
-      var ele = this.ClientDatayl
-      setTimeout(() => {
-        var that = this
-        html2canvas(document.getElementById('resumeId1'), { useCORS: true }).then(function(canvas) {
-          var imgData = canvas.toDataURL('image/png')
-          var sendImgData = imgData.substring(imgData.indexOf(',') + 1)
-          var postData = { 'reportId': ele.id, 'imgStr': sendImgData, 'url': window.location.href, 'emailUser': e.name, 'copyTo': e.names }
-          projectTestReportSendmail(postData).then(res => {
-            that.dialogFormVisible_one = false
-            res.code === 200 ? that.$message.success('发送测试报告成功') : that.$message.error('发送测试报告失败，请联系管理员！')
-          })
-        })
-      }, 500)
     }
+    // download() {
+    //   this.getPdf('resumeId', this.name)
+    // },
+    // download1() {
+    //   this.getPdf('resumeId1', this.name)
+    // },
+    // sendReport(e) {
+    //   var ele = this.ClientDatayl
+    //   setTimeout(() => {
+    //     var that = this
+    //     html2canvas(document.getElementById('resumeId'), { useCORS: true }).then(function(canvas) {
+    //       var imgData = canvas.toDataURL('image/png')
+    //       var sendImgData = imgData.substring(imgData.indexOf(',') + 1)
+    //       var postData = { 'reportId': ele.id, 'imgStr': sendImgData, 'url': window.location.href, 'emailUser': e.name, 'copyTo': e.names }
+    //       projectTestReportSendmail(postData).then(res => {
+    //         that.dialogFormVisible_one = false
+    //         res.code === 200 ? that.$message.success('发送测试报告成功') : that.$message.error('发送测试报告失败，请联系管理员！')
+    //       })
+    //     })
+    //   }, 500)
+    // },
   }
 }
 </script>
@@ -642,7 +400,7 @@ export default {
     height:100%;
     display: inline-block;
     font-size: 14px;
-    color: #606266;
+    color: #333B4A;
   }
   .titleStyle {
     color: #333B4A;

src/views/Platform/presentation/Templates/ClientReport.vue

@@ -28,8 +28,8 @@
     </div>
     <div v-show="showTow">
       <div class="descr" style=" margin-bottom: 2%; height: 480px; overflow:scroll; overflow-x: hidden">
-        <ClientAcceptance v-if="ClientAcceptance1" ref="ClientAcceptance" />
-        <Acceptance v-if="Acceptance1" ref="Acceptance" />
+        <ClientAcceptance v-if="ClientAcceptance1" ref="ClientAcceptance" @QuasiReport="QuasiReport" />
+        <Acceptance v-if="Acceptance1" ref="Acceptance" @QuasiReport="QuasiReport" />
       </div>
       <div align="center">
         <el-button size="small" type="primary" @click="handleClose1()">上一步</el-button>
@@ -48,11 +48,11 @@
         报告预览
       </div>
       <div class="descr" style=" margin-bottom: 2%; height: 350px; overflow:scroll; overflow-x: hidden">
-        <ResultPageyL />
+        <ResultPageyL id="resumeId1" :message="report" />
       </div>
       <div align="center">
         <el-button size="small" type="primary" @click="gou_out()">上一步</el-button>
-        <el-button size="small" type="primary">发送</el-button>
+        <el-button size="small" type="primary" @click="sendReport(form)">发送</el-button>
       </div>
     </div>
   </el-dialog>
@@ -62,6 +62,8 @@
 import ClientAcceptance from '@/views/Platform/presentation/ClientAcceptance.vue'
 import Acceptance from '@/views/Platform/presentation/Acceptance.vue'
 import ResultPageyL from '@/views/Platform/presentation/ResultPageyL.vue'
+import { projectTestReportSendmail } from '@/api/ResultPage'
+import html2canvas from 'html2canvas'
 
 export default {
   components: {
@@ -80,6 +82,7 @@ export default {
       showOne: true,
       radio: '3',
       form: {},
+      report: {},
       active: 1,
       src: 'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg'
     }
@@ -105,10 +108,13 @@ export default {
       if (this.radio === '2') {
         this.$refs.Acceptance.parentHandleclick()
       }
-      // this.active = 3
-      // this.showThree = true
-      // this.showTow = false
-      Acceptance
+    },
+    QuasiReport(e) {
+      console.log(e, 'zhunchu')
+      this.report = e
+      this.active = 3
+      this.showThree = true
+      this.showTow = false
     },
     gou_out() {
       this.showThree = false
@@ -135,6 +141,23 @@ export default {
           this.$message({ message: '请选择要创建的‘模版’', type: 'error', duration: 1000, offset: 150 })
           break
       }
+    },
+    sendReport(e) {
+      var ele = this.report
+      setTimeout(() => {
+        var that = this
+        var targetDom = document.getElementById('resumeId1')
+        var copyDom = targetDom.cloneNode(true)
+        document.querySelector('body').appendChild(copyDom)
+        html2canvas(copyDom, { useCORS: true }).then(function(canvas) {
+          var imgData = canvas.toDataURL('image/png')
+          var sendImgData = imgData.substring(imgData.indexOf(',') + 1)
+          var postData = { 'reportId': ele.id, 'imgStr': sendImgData, 'url': window.location.href, 'emailUser': e.name, 'copyTo': e.names }
+          projectTestReportSendmail(postData).then(res => {
+            res.code === 200 ? that.$message.success('发送测试报告成功') : that.$message.error('发送测试报告失败，请联系管理员！')
+          })
+        })
+      }, 1000)
     }
   }
 }

src/views/Platform/testPage.vue

@@ -202,7 +202,7 @@ export default {
       projectTypeStrings: [],
       taskTypeStrings: [],
       userInformation: localStorage.getItem('username'),
-      bizJson: localStorage.getItem('key'),
+      bizJson: localStorage.getItem('bizId'),
       createTimeData: '',
       pageSize: 8,
       curIndex: 1,
@@ -253,6 +253,10 @@ export default {
     this.AllQueryFolderData()
     this.caseFolder_Nav()
     this.get_selectData()
+    this.$store.state.data.status = true
+  },
+  destroyed() {
+    this.$store.state.data.status = false
   },
   mounted() {
     this.imFile = document.getElementById('imFile')
@@ -260,7 +264,7 @@ export default {
   methods: {
     // init初始化
     AllQueryFolderData() {
-      queryTestPlanTree({ bizId: localStorage.getItem('key') }).then(res => {
+      queryTestPlanTree({ bizId: localStorage.getItem('bizId') }).then(res => {
         if (res.code === 200) {
           this.data1 = res.data.map(item => ({
             ...item,
@@ -287,7 +291,7 @@ export default {
     },
 
     caseFolder_Nav() {
-      queryAllFolderData({ bizId: localStorage.getItem('key') }).then(res => {
+      queryAllFolderData({ bizId: localStorage.getItem('bizId') }).then(res => {
         if (res.code === 200) {
           for (var ele of res.data) {
             this.arr = {}

src/views/Platform/useCasePage.vue

@@ -176,7 +176,7 @@ export default {
       priorityStrings: [{ name: 'p0', value: 0 }, { name: 'p1', value: 1 }, { name: 'p2', value: 2 }, { name: 'p3', value: 3 }],
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
-      bizJson: localStorage.getItem('key'),
+      bizJson: localStorage.getItem('bizId'),
       userData: '',
       caseInfo: '',
       pageSize: 8,
@@ -202,17 +202,16 @@ export default {
     }
   },
   created() {
-    this.AllQueryFolderData(localStorage.getItem('key'))
+    this.AllQueryFolderData(localStorage.getItem('bizId'))
+    this.$store.state.data.status = true
+  },
+  destroyed() {
+    this.$store.state.data.status = false
   },
   mounted() {
-    // var that = this
-    // Utils.$on('demo', function(msg) {
-    //   that.AllQueryFolderData(msg)
-    // })
     this.imFile = document.getElementById('imFile')
     this.im_File = document.getElementById('im_File')
     this.initWindow()
-    // this.AllQueryFolderData(localStorage.getItem('key'))
   },
   activated() {
     this.updateCaseListData()
@@ -370,9 +369,9 @@ export default {
       this.key_arr = []
       if (val === '') { // 判断用户是否有输入
         val = this.label // 没有输入拿之前的label替代
-        this.end_Data = { folderName: val, xmindUrl: '', id: data.id, bizId: localStorage.getItem('key'), modifier: this.userInformation, creator: this.userInformation }
+        this.end_Data = { folderName: val, xmindUrl: '', id: data.id, bizId: localStorage.getItem('bizId'), modifier: this.userInformation, creator: this.userInformation }
       } else {
-        this.end_Data = { folderName: val, xmindUrl: '', id: data.id, bizId: localStorage.getItem('key'), modifier: this.userInformation, creator: this.userInformation }
+        this.end_Data = { folderName: val, xmindUrl: '', id: data.id, bizId: localStorage.getItem('bizId'), modifier: this.userInformation, creator: this.userInformation }
       }
       this.$set(data, 'que', false) // 失去焦点隐藏input
       this.$set(this.node_Name, 'name', '') // 清空input
@@ -380,12 +379,12 @@ export default {
         if (res.code === 200) {
           this.$message({ type: 'success', message: res.msg, duration: 1000 })
           this.data1 = []
-          this.AllQueryFolderData(localStorage.getItem('key'))
+          this.AllQueryFolderData(localStorage.getItem('bizId'))
           this.key_arr.push(this.startId)
         } else {
           this.$message({ type: 'error', message: res.msg, duration: 1000 })
           this.data1 = []
-          this.AllQueryFolderData(localStorage.getItem('key'))
+          this.AllQueryFolderData(localStorage.getItem('bizId'))
         }
       })
     },
@@ -546,11 +545,11 @@ export default {
         if (res.code === 200) {
           this.$message({ type: 'success', message: res.msg, duration: 1000 })
           this.data1 = []
-          this.AllQueryFolderData(localStorage.getItem('key'))
+          this.AllQueryFolderData(localStorage.getItem('bizId'))
         } else {
           this.$message({ type: 'error', message: res.msg, duration: 1000 })
           this.data1 = []
-          this.AllQueryFolderData(localStorage.getItem('key'))
+          this.AllQueryFolderData(localStorage.getItem('bizId'))
         }
       })
     },
@@ -571,7 +570,7 @@ export default {
             if (res.code === 200) {
               this.$message({ type: 'success', message: '已删除' })
               this.data1 = []
-              this.AllQueryFolderData(localStorage.getItem('key'))
+              this.AllQueryFolderData(localStorage.getItem('bizId'))
               this.key_arr.push(this.startId)
             } else {
               this.$message({ type: 'error', message: res.msg, duration: 1000 })

src/views/projectManage/dialog_vue.vue

@@ -386,7 +386,7 @@ export default {
 }
 
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
 .el-dialog__header {
     padding: 0px 0px 0px;
 }

src/views/projectManage/projectList/projectViewDetails.vue

@@ -266,7 +266,7 @@
               <el-col :span="1" class="item-click">|</el-col>
               <el-col :span="2" class="item-click" @click.native="handlePlan('test')">提测</el-col>
               <el-col :span="2" class="item-click" @click.native="handlePlan('allow')">准出</el-col>
-              <el-col :span="4" class="item-click">建立测试日报</el-col>
+              <el-col :span="4" class="item-click" @click.native="handlePlan('daily')">建立测试日报</el-col>
               <el-col :span="4" class="item-click" @click.native="handlePlan('cancel')">取消选择</el-col>
             </el-row>
             <el-table
@@ -570,6 +570,9 @@
       @cancel="closeDioang()"
       @confirm="createDialogVisible=false"
     />
+    <TestReport v-if="dialogTestReport" ref="TestReport" />
+    <DailyReport v-if="dialogDailyReport" ref="DailyReport" />
+    <ClientReport v-if="dialogClientReport" ref="ClientReport" />
   </div>
 </template>
 
@@ -593,11 +596,17 @@ import RequirementCreate from '@/views/projectManage/requirement/list/create'
 import { showRequirementEnum } from '@/api/requirement.js'
 import createdBug from '@/views/projectManage/bugList/file/createdBug'
 import '@/views/projectManage/projectList/css/index.css'
+import TestReport from '@/views/Platform/presentation/Templates/TestReport' // 提测
+import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' // 日报
+import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
 export default {
   components: {
     openDialog,
     RequirementCreate,
-    createdBug
+    createdBug,
+    TestReport,
+    DailyReport,
+    ClientReport
   },
   filters: {
     dateStr(value) {
@@ -736,7 +745,10 @@ export default {
       curcentList: [], // 当前已选择的列表
       curcentChecked: 0, // 当前已选择的数量
       planChecked: false,
-      planHandleType: '' // 任务列表操作类型
+      planHandleType: '', // 任务列表操作类型
+      dialogTestReport: false, // 提测
+      dialogDailyReport: false, // 日报
+      dialogClientReport: false// 准出
     }
   },
   created() {
@@ -1151,6 +1163,9 @@ export default {
       val.length > 0 ? this.showHeader = false : this.showHeader = true
       this.curcentChecked = val.length
       this.curcentList = val
+      if (val.length === this.all_task.length) {
+        this.planChecked = true
+      }
     },
     changeCheck(val) {
       if (val) {
@@ -1170,6 +1185,9 @@ export default {
         case 'allow':
           this.filtrateAllow()
           break
+        case 'daily':
+          this.filtrateDaily()
+          break
         case 'cancel':
           this.$refs.planTable.clearSelection()
           break
@@ -1186,6 +1204,11 @@ export default {
           duration: 3000,
           offset: 150
         })
+      } else {
+        this.dialogTestReport = true
+        this.$nextTick(() => {
+          this.$refs.TestReport.init()
+        })
       }
     },
     filtrateAllow() { // 准出筛选
@@ -1199,7 +1222,18 @@ export default {
           duration: 3000,
           offset: 150
         })
+      } else {
+        this.dialogClientReport = true
+        this.$nextTick(() => {
+          this.$refs.ClientReport.init()
+        })
       }
+    },
+    filtrateDaily() { // 建立日报
+      this.dialogDailyReport = true
+      this.$nextTick(() => {
+        this.$refs.DailyReport.init()
+      })
     }
   }
 }

src/views/projectManage/taskList/taskViewDetails.vue

@@ -317,7 +317,7 @@
                   <template slot-scope="scope">{{ scope.row.statusString }}</template>
                 </el-table-column>
                 <el-table-column label="创建人" min-width="100" align="center">
-                  <template slot-scope="scope">{{ scope.row.creater }}</template>
+                  <template slot-scope="scope">{{ scope.row.createrObject.name }}</template>
                 </el-table-column>
                 <el-table-column label="创建日期" min-width="200" align="center">
                   <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
@@ -367,10 +367,10 @@
                   <template slot-scope="scope">{{ scope.row.reportName }}</template>
                 </el-table-column>
                 <el-table-column label="状态" min-width="100" align="center">
-                  <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
+                  <template slot-scope="scope">{{ scope.row.statusString }}</template>
                 </el-table-column>
                 <el-table-column label="创建人" min-width="100" align="center">
-                  <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
+                  <template slot-scope="scope">{{ scope.row.ownner }}</template>
                 </el-table-column>
                 <el-table-column label="创建日期" min-width="100" align="center">
                   <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
@@ -386,13 +386,13 @@
                 show-overflow-tooltip="true"
               >
                 <el-table-column label="标题名称" min-width="100" align="center">
-                  <template slot-scope="scope">{{ scope.row.name }}</template>
+                  <template slot-scope="scope">{{ scope.row.reportName }}</template>
                 </el-table-column>
                 <el-table-column label="状态" min-width="100" align="center">
                   <template slot-scope="scope">{{ scope.row.statusString }}</template>
                 </el-table-column>
                 <el-table-column label="创建人" min-width="100" align="center">
-                  <template slot-scope="scope">{{ scope.row.creater }}</template>
+                  <template slot-scope="scope">{{ scope.row.createrObject.name }}</template>
                 </el-table-column>
                 <el-table-column label="创建日期" min-width="100" align="center">
                   <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
@@ -787,8 +787,8 @@ export default {
         this.tiem_date.endTime = res.data.scheduleListResponse.endTime // 结束时间
         this.arr_event = res.data.scheduleListResponse.schedulDetailResponseList
         this.table_loading = false
-        this.launchTestInfoDOS = res.data.launchTestInfoDOS // 提测
-        this.dailyTestReports = res.data.dailyTestReports // 测试
+        // this.launchTestInfoDOS = res.data.launchTestInfoDOS // 提测
+        // this.dailyTestReports = res.data.dailyTestReports // 测试
         // this.projectTestReportDOS = res.data.projectTestReportDOS // 准出
         this.bug_list(-1)
         this.task_form.bugBaseInfoDOList !== null ? (this.bugBaseInfoDOList = res.date.bugBaseInfoDOList) : (this.bugBaseInfoDOList = []) // bug
@@ -1388,7 +1388,7 @@ export default {
   }
 }
 </script>
-<style lang="stylus" >
+<style lang="stylus" scoped>
 .footer .el-tabs__nav-wrap::after {
   background-color: #FFFFFF !important;
 }