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

src/views/projectManage/requirement/requirementDetail.vue

@@ -330,6 +330,7 @@ import {
   // scheduleGetHistoryScheduleById,
   settingQueryBizRqmtOrntList
 } from '@/api/requirement.js'
+import { projectGetMemberList } from '@/api/drewer'
 import { configShowTaskEnum } from '@/api/taskIndex'
 import searchPeople from '@/components/select/searchPeople'
 import textArea from '@/components/input/textArea'
@@ -470,12 +471,19 @@ export default {
       this.taskScheduleList = res.data
       this.BackToTheLatest = true
     },
-    changeSchedule() { // 修改锁定状态
+    async changeSchedule() { // 修改锁定状态
       if (this.isScheduleLocked === 1) {
-        if (this.form_query.pmMemberInfoResponse.idap === localStorage.getItem('username')) {
-          this.scheduleVisble = true
-        } else {
-          this.$message({ message: '没有权限，请联系PM执行解锁！', type: 'error', duration: 1000, offset: 150 })
+        const res = await projectGetMemberList({ projectId: this.form_query.belongingProject, requireId: this.requirementId })
+        if (res.code === 200) {
+          const data = res.data.PM
+          data.map(item => {
+            if (item.memberInfoResponse.idap === localStorage.getItem('username')) {
+              this.scheduleVisble = true
+            }
+          })
+          if (!this.scheduleVisble) {
+            this.$message({ message: '没有权限，请联系PM执行解锁！', type: 'error', duration: 2000, offset: 150 })
+          }
         }
       } else {
         this.scheduleVisble = true

src/views/quality/components/statusChart.vue

@@ -86,16 +86,7 @@ export default {
     },
     handlerXdata(arr) {
       if (!this.seriesData[0]) return []
-      let newArr = []
-      if (this.seriesData[0].dayTime.length <= 12) {
-        newArr = this.seriesData[0].dayTime
-      } else {
-        const gap = Math.floor(this.seriesData[0].dayTime.length / 12)
-        newArr = this.seriesData[0].dayTime.filter((item, index) => {
-          return index % gap === 0
-        })
-      }
-      return newArr
+      return this.seriesData[0].dayTime
     },
     setPile() {
       this.echartsOption = {

src/views/reportManagement/ReleaseReport/components/iconDisplay.vue

@@ -24,18 +24,17 @@
       size="mini"
       :header-cell-style="{ backgroundColor: 'rgba(241,241,241,1)', color: 'rgba(51,59,74,1)', fontSize: '14px', fontWeight: '400'}"
       style="width: 100%"
-      show-overflow-tooltip="true"
     >
-      <el-table-column prop="bugName" label="缺陷标题" align="center" min-width="100" show-overflow-tooltip>
+      <el-table-column prop="bugName" label="缺陷标题" align="center" min-width="100">
         <template slot-scope="scope">
           <span class="didi-hover" @click.stop="click_bugName(scope.row.id)">{{ scope.row.bugName }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="bugStatusName" label="缺陷状态" align="center" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="priorityLevel" label="缺陷等级" align="center" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="creatorList" label="提报人" align="center" min-width="90" show-overflow-tooltip />
-      <el-table-column prop="assignerList" label="责任人" align="center" min-width="90" show-overflow-tooltip />
-      <el-table-column prop="currentHandlerList" label="修复人" align="center" min-width="90" show-overflow-tooltip />
+      <el-table-column prop="bugStatusName" label="缺陷状态" align="center" min-width="100" />
+      <el-table-column prop="priorityLevel" label="缺陷等级" align="center" min-width="100" />
+      <el-table-column prop="creatorList" label="提报人" align="center" min-width="90" />
+      <el-table-column prop="assignerList" label="责任人" align="center" min-width="90" />
+      <el-table-column prop="currentHandlerList" label="修复人" align="center" min-width="90" />
       <el-table-column prop="reasonOrDesc" label="备注（hold原因等）" align="center" min-width="150" />
     </el-table>
   </div>

src/views/reportManagement/ReleaseReport/components/releaseDetails.vue

@@ -15,90 +15,131 @@
     </el-header>
     <el-container>
       <el-main class="report-main">
-        <div class="title"><div class="blur-column" /> 报告内容</div>
+        <div class="title">
+          <div class="blur-column" />报告内容
+        </div>
         <el-row>
           <el-col :span="24" class="task-bot">
-            <span class="from-names">测试结果： </span>
+            <span class="from-names">测试结果：</span>
             <span class="from-value" style="color:rgba(126,211,33,1);">通过</span>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name"><span class="test-details">计划准出时间：</span>{{ details.releasePlanTime }}</span>
+            <span class="from-name">
+              <span class="test-details">计划准出时间：</span>
+              {{ details.releasePlanTime }}
+            </span>
           </el-col>
           <el-col :span="12">
-            <span class="from-namev"><span class="test-details">实际准出时间：</span>{{ details.releaseActualTime }}</span>
+            <span class="from-namev">
+              <span class="test-details">实际准出时间：</span>
+              {{ details.releaseActualTime }}
+            </span>
           </el-col>
         </el-row>
 
-        <el-row v-if="details.isDelay === 1">
+        <el-row v-if="details.releasePlanTime < details.releaseActualTime">
           <el-col :span="24" class="Layout_space_between task-bot">
-            <span class="from-namea"><span class="test-details">准出延期原因 : </span>{{ details.delayReason }}</span>
+            <span class="from-namea">
+              <span class="test-details">准出延期原因 :</span>
+              {{ details.delayReason }}
+            </span>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name"><span class="test-details">计划开发周期：</span>{{ details.testPlanTimeStart }}</span>
+            <span class="from-name">
+              <span class="test-details">计划开发周期：</span>
+              {{ details.devPlanTimeStart }} 至 {{ details.devPlanTimeEnd }}
+            </span>
           </el-col>
           <el-col :span="12" class="Layout_space_between">
-            <span class="from-namer"><span class="test-details">实际开发周期：</span>{{ details.testPlanTimeEnd }}</span>
+            <span class="from-namer">
+              <span class="test-details">实际开发周期：</span>
+              {{ details.devActualTimeStart }} 至 {{ details.devActualTimeEnd }}
+            </span>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name"><span class="test-details">计划测试周期：</span>{{ details.testActualTimeStart }} </span>
+            <span class="from-name">
+              <span class="test-details">计划测试周期：</span>
+              {{ details.testPlanTimeStart }} 至 {{ details.testPlanTimeEnd }}
+            </span>
           </el-col>
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer"><span class="test-details">实际测试周期：</span>{{ details.testActualTimeEnd }}</span>
+            <span class="from-namer">
+              <span class="test-details">实际测试周期：</span>
+              {{ details.testActualTimeStart }} 至 {{ details.testActualTimeEnd }}
+            </span>
           </el-col>
         </el-row>
 
         <el-row class="task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name"><span class="test-details">开发人员：</span>{{ details.developer }}</span>
+            <span class="from-name">
+              <span class="test-details">开发人员：</span>
+              <span v-for="(item, index) in details.devObject" :key="index">{{ item.name }}</span>
+            </span>
           </el-col>
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer"><span class="test-details">测试人员：</span>{{ details.tester }}</span>
+            <span class="from-namer">
+              <span class="test-details">测试人员：</span>
+              <span v-for="(item, index) in details.testerObject" :key="index">{{ item.name }}</span>
+            </span>
           </el-col>
         </el-row>
         <div v-html="details.content" />
 
-        <div class="title"> 缺陷统计</div>
-        <icon-display :task-ids="details.statusString === '已发送' ? details : details.taskIds" />
+        <div class="title">缺陷统计</div>
+        <icon-display :task-ids="details.statusString === ' 已发送' ? details : details.taskIds" />
       </el-main>
       <el-aside width="400px">
         <el-container>
           <el-header class="report-mains">
-            <div class="title"><div class="blur-column" /> 用户信息</div>
+            <div class="title">
+              <div class="blur-column" />用户信息
+            </div>
             <div class="Layout_flex_start task-bot">
-              <div class="title-name">报告人 : </div>
+              <div class="title-name">报告人 :</div>
               <div class="task-name">{{ details.reportorObject ? details.reportorObject.name : '' }}</div>
             </div>
             <div class="Layout_flex_start task-bot">
-              <div class="title-name">收件人 : </div>
-              <div v-for="(item, index) in details.sendToObject" :key="index" class="task-name"> {{ item.name }} <span v-if="index < details.sendToObject.length - 1"> , </span></div>
+              <div class="title-name">收件人 :</div>
+              <div v-for="(item, index) in details.sendToObject" :key="index" class="task-name">
+                {{ item.name }}
+                <span v-if="index < details.sendToObject.length - 1">,</span>
+              </div>
             </div>
             <div class="Layout_flex_start task-bot">
-              <div class="title-name">抄送人 : </div>
-              <div v-for="(item, index) in details.sendCcObject" :key="index" class="task-name">{{ item.name }} <span v-if="index < details.sendCcObject.length - 1"> , </span></div>
+              <div class="title-name">抄送人 :</div>
+              <div v-for="(item, index) in details.sendCcObject" :key="index" class="task-name">
+                {{ item.name }}
+                <span v-if="index < details.sendCcObject.length - 1">,</span>
+              </div>
             </div>
           </el-header>
           <el-main class="report-mains">
-            <div class="title"><div class="blur-column" /> 时间</div>
+            <div class="title">
+              <div class="blur-column" />时间
+            </div>
             <div class="Layout_flex_start task-bot">
-              <div class="title-name">创建时间 : </div>
+              <div class="title-name">创建时间 :</div>
               <div class="task-name">{{ details.gmtCreate }}</div>
             </div>
             <div class="Layout_flex_start task-bot">
-              <div class="title-name">发送时间 : </div>
+              <div class="title-name">发送时间 :</div>
               <div class="task-name">{{ details.reportTime }}</div>
             </div>
           </el-main>
           <el-footer class="report-mains">
-            <div class="title"><div class="blur-column" /> 关联任务</div>
+            <div class="title">
+              <div class="blur-column" />关联任务
+            </div>
             <div v-for="(item, index) in details.taskDetailList" :key="index" class="Layout_flex_start task-bot">
               <div class="task-id">{{ item.taskId }}</div>
               <el-tooltip class="item" effect="dark" :content="item.name" placement="top-start">
@@ -126,7 +167,10 @@
 
 <script>
 import '@/styles/PublicStyle/index.scss'
-import { reportreleaseGetReportById, reportreleaseDelete } from '@/api/reportTemplate'
+import {
+  reportreleaseGetReportById,
+  reportreleaseDelete
+} from '@/api/reportTemplate'
 import iconDisplay from '@/views/reportManagement/ReleaseReport/components/iconDisplay.vue'
 import ReleaseReport from '@/views/reportManagement/components/ReleaseReport' // 准出
 export default {
@@ -146,13 +190,15 @@ export default {
     this.reportreleaseGetReportById(this.reportId)
   },
   methods: {
-    async reportreleaseGetReportById(e) { // 获取准出报告data
+    async reportreleaseGetReportById(e) {
+      // 获取准出报告data
       const res = await reportreleaseGetReportById(e)
       if (res.code === 200) {
         this.details = res.data
       }
     },
-    clientButtom(e, data) { // 准出报告
+    clientButtom(e, data) {
+      // 准出报告
       this.report_data = data
       this.dialogDaily = true
       this.$nextTick(() => {
@@ -161,10 +207,14 @@ export default {
     },
 
     goTaskDetails(id) {
-      this.$router.push({ name: '任务详情', query: { id: id }})
+      this.$router.push({
+        name: '任务详情',
+        query: { id: id }
+      })
     },
 
-    async deleteDaily() { // 删除准出报告
+    async deleteDaily() {
+      // 删除准出报告
       const res = await reportreleaseDelete({}, this.details.id)
       if (res.code === 200) {
         this.dialog_testData = false
@@ -176,22 +226,22 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 .BackgroundCloth {
-.report-Header {
-  margin: 10px 10px 0;
-  background: #FFF;
-  border-radius:4px;
-}
-.from-margin {
+  .report-Header {
+    margin: 10px 10px 0;
+    background: #fff;
+    border-radius: 4px;
+  }
+  .from-margin {
     width: 100%;
     display: inline-block;
-    font-size:14px;
-    font-family:Microsoft Sans Serif;
-    font-weight:400;
-    line-height:22px;
-    color:#333;
-    opacity:1;
+    font-size: 14px;
+    font-family: Microsoft Sans Serif;
+    font-weight: 400;
+    line-height: 22px;
+    color: #333;
+    opacity: 1;
     .from-name {
       width: 140px !important;
     }
@@ -203,112 +253,112 @@ export default {
     }
     .from-namer {
       width: 140px !important;
-      margin-left:10px;
+      margin-left: 10px;
     }
     .from-namev {
-      margin-left:10px;
+      margin-left: 10px;
       vertical-align: sub;
     }
     .from-value {
       margin-left: 30px;
     }
-  .report-taskList{
-    font-size:14px;
-    font-family:MicrosoftYaHei;
-    line-height:17px;
-    color:rgba(102,102,102,1);
-    margin-top: 10px;
-    opacity:1;
+    .report-taskList {
+      font-size: 14px;
+      font-family: MicrosoftYaHei;
+      line-height: 17px;
+      color: rgba(102, 102, 102, 1);
+      margin-top: 10px;
+      opacity: 1;
+    }
   }
-}
 
-.details-id {
-  font-size:12px;
-  font-family:PingFang SC;
-  font-weight:400;
-  line-height:20px;
-  color:rgba(51,59,74,1);
-  opacity:0.5;
-}
+  .details-id {
+    font-size: 12px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    line-height: 20px;
+    color: rgba(51, 59, 74, 1);
+    opacity: 0.5;
+  }
 
-.report-title {
-  font-size:20px;
-  font-family:PingFangSC-Medium;
-  line-height:28px;
-  color:rgba(51,59,74,1);
-  opacity:1;
-}
+  .report-title {
+    font-size: 20px;
+    font-family: PingFangSC-Medium;
+    line-height: 28px;
+    color: rgba(51, 59, 74, 1);
+    opacity: 1;
+  }
 
-.details-statusString {
-  font-size:14px;
-  font-family:MicrosoftYaHei;
-  line-height:17px;
-  padding: 5px 8px;
-  margin-left: 15px;
-  color:rgba(111,124,147,1);
-  border:1px solid rgba(191,198,220,1);
-  opacity:1;
-  border-radius:4px;
-}
+  .details-statusString {
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    line-height: 17px;
+    padding: 5px 8px;
+    margin-left: 15px;
+    color: rgba(111, 124, 147, 1);
+    border: 1px solid rgba(191, 198, 220, 1);
+    opacity: 1;
+    border-radius: 4px;
+  }
 
-.report-main {
-  margin: 10px;
-  background: #FFF;
-  border-radius:4px;
-}
-.report-mains {
-  min-height: 200px;
-  padding: 20px 30PX;
-  margin: 10px 10px 0 0;
-  background: #FFF;
-  border-radius:4px;
-}
-.title {
-  font-size:16px;
-  font-family:PingFangSC-Medium;
-  margin-bottom: 10px;
-  color:rgba(51,59,74,1);
-  opacity:1;
-}
+  .report-main {
+    margin: 10px;
+    background: #fff;
+    border-radius: 4px;
+  }
+  .report-mains {
+    min-height: 200px;
+    padding: 20px 30px;
+    margin: 10px 10px 0 0;
+    background: #fff;
+    border-radius: 4px;
+  }
+  .title {
+    font-size: 16px;
+    font-family: PingFangSC-Medium;
+    margin-bottom: 10px;
+    color: rgba(51, 59, 74, 1);
+    opacity: 1;
+  }
 
-.title-name {
-  width:100px;
-  font-size:14px;
-  font-family:PingFangSC-Regular;
-  line-height:20px;
-  color:rgba(102,102,102,1);
-  opacity:1;
-}
+  .title-name {
+    width: 100px;
+    font-size: 14px;
+    font-family: PingFangSC-Regular;
+    line-height: 20px;
+    color: rgba(102, 102, 102, 1);
+    opacity: 1;
+  }
 
-.task-id {
-  width:100px;
-  font-size:14px;
-  font-family:MicrosoftYaHei;
-  line-height:17px;
-  color:rgba(102,102,102,1);
-  opacity:1;
-}
+  .task-id {
+    width: 100px;
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    line-height: 17px;
+    color: rgba(102, 102, 102, 1);
+    opacity: 1;
+  }
 
-.task-name {
-  font-size:14px;
-  font-family:MicrosoftYaHei;
-  line-height:17px;
-  color:rgba(51,51,51,1);
-  opacity:1;
-}
+  .task-name {
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    line-height: 17px;
+    color: rgba(51, 51, 51, 1);
+    opacity: 1;
+  }
 
-.blur-column {
-  width:4px;
-  height:15px;
-  display:inline-block;
-  vertical-align: middle;
-  background:#409EFF;
-  border-radius:1px;
-}
+  .blur-column {
+    width: 4px;
+    height: 15px;
+    display: inline-block;
+    vertical-align: middle;
+    background: #409eff;
+    border-radius: 1px;
+  }
 
-.task-bot {
-   margin-bottom: 10px;
-}
+  .task-bot {
+    margin-bottom: 10px;
+  }
 }
 .setLine {
   padding: 10px 20px;

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -54,7 +54,7 @@
         </el-col>
       </el-row>
 
-      <el-row v-if="from.isDelay === 1 || from.releasePlanTime < from.releaseActualTime" style="margin: 20px 0">
+      <el-row v-if="from.releasePlanTime < from.releaseActualTime" style="margin: 20px 0">
         <!-- 准出是否延期 1 延期，0未延期 -->
         <el-col :span="24" class="Layout_space_between">
           <span class="from-namea"><span v-if="!releaseType" style="color:red;">*</span>准出延期原因 : </span>
@@ -164,9 +164,11 @@ export default {
     taskIds: {
       handler(newV) {
         if (newV) {
-          newV.map(item => {
-            this.judge = true
-            this.remoteMethod(item)
+          this.$nextTick(() => {
+            this.taskId = newV
+            newV.map(item => {
+              this.remoteMethod_data(item)
+            })
           })
           this.reportreleaseInitReportRelease(newV)
         }
@@ -179,10 +181,9 @@ export default {
       const res = await reportreleaseGetReportById(val)
       if (res.code === 200) {
         this.$nextTick(() => {
-          const taskId = res.data.taskIds
-          taskId.map(item => {
-            this.judge = true
-            this.remoteMethod(item)
+          this.taskId = res.data.taskIds
+          this.taskId.map(item => {
+            this.remoteMethod_data(item)
           })
         })
         this.setDefaultData(res.data)
@@ -238,15 +239,17 @@ export default {
       }
     },
 
+    async remoteMethod_data(query) { // 远程搜索任务
+      const res = await taskList({ name: query })
+      if (res.code === 200) {
+        this.tasksDetailList.push(res.data[0])
+      }
+    },
+
     async remoteMethod(query) { // 远程搜索任务
-      const res = await taskList({ bizId: Number(localStorage.getItem('bizId')), name: query })
+      const res = await taskList({ name: query })
       if (res.code === 200) {
         this.tasksOptions = res.data
-        if (this.judge) {
-          this.tasksDetailList.push(res.data[0])
-          this.taskId.push(res.data[0].id)
-          this.judge = false
-        }
       }
     },
 
@@ -293,17 +296,17 @@ export default {
             data.reportName = this.from.reportName // 报告名称
             data.releasePlanTime = this.from.releasePlanTime // 计划准出时间
             data.releaseActualTime = this.from.releaseActualTime // 实际准出时间
-            if (this.from.releasePlanTime > this.from.releaseActualTime) {
+            if (this.from.releasePlanTime < this.from.releaseActualTime) {
               data.isDelay = 1// 准出是否延期 1 延期，0未延期
+              if (this.from.delayReason) {
+                data.delayReason = this.from.delayReason // 是否延期
+              } else {
+                this.$message({ type: 'warning', message: '准出原因不能为空' })
+                return false
+              }
             } else {
               data.isDelay = 0
             }
-            if (this.from.delayReason) {
-              data.delayReason = this.from.delayReason // 是否延期
-            } else {
-              this.$message({ type: 'warning', message: '准出原因不能为空' })
-              return false
-            }
             if (this.from.devPlanTimeStart) {
               data.devPlanTimeStart = this.from.devPlanTimeStart[0] // 计划开发开始时间
               data.devPlanTimeEnd = this.from.devPlanTimeStart[1] // 计划开发结束时间
@@ -343,17 +346,17 @@ export default {
             data.reportName = this.from.reportName // 报告名称
             data.releasePlanTime = this.from.releasePlanTime // 计划准出时间
             data.releaseActualTime = this.from.releaseActualTime // 实际准出时间
-            if (this.from.releasePlanTime > this.from.releaseActualTime) {
+            if (this.from.releasePlanTime < this.from.releaseActualTime) {
               data.isDelay = 1// 准出是否延期 1 延期，0未延期
+              if (this.from.delayReason) {
+                data.delayReason = this.from.delayReason // 是否延期
+              } else {
+                this.$message({ type: 'warning', message: '准出原因不能为空' })
+                return false
+              }
             } else {
               data.isDelay = 0
             }
-            if (this.from.delayReason) {
-              data.delayReason = this.from.delayReason // 是否延期
-            } else {
-              this.$message({ type: 'warning', message: '准出原因不能为空' })
-              return false
-            }
             if (this.from.devPlanTimeStart) {
               data.devPlanTimeStart = this.from.devPlanTimeStart[0] // 计划开发开始时间
               data.devPlanTimeEnd = this.from.devPlanTimeStart[1] // 计划开发结束时间

src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 预览准出报告 -->
   <div class="parent-style">
-    <div class="backStyle"> 邮件列表</div>
+    <div class="backStyle">邮件列表</div>
     <div class="Layout_space_between bottom_mar">
       <div class="div1">收件人</div>
       <searchTeam :value.sync="form.name" :clearable="true" :multiple="true" style="width:100%" />
@@ -10,12 +10,12 @@
       <div class="div1">抄送</div>
       <searchTeam :value.sync="form.names" :clearable="true" :multiple="true" style="width:100%" />
     </div>
-    <span class="backStyle"> 关联任务</span>
+    <span class="backStyle">关联任务</span>
     <div v-for="(item, index) in fromCreateData.taskDetailList" :key="index" class="Layout_flex_start report-taskList">
       <span>{{ item.taskId }}</span>
       <span>{{ item.name }}</span>
     </div>
-    <div class="backStyle"> 报告预览</div>
+    <div class="backStyle">报告预览</div>
     <div id="repot-list">
       <div class="Layout_space_between" style="border-bottom: 0.5px solid #eee;margin-bottom: 15px;">
         <div class="reportName">{{ fromCreateData.reportName }}</div>
@@ -24,7 +24,7 @@
 
       <el-row>
         <el-col :span="24">
-          <span class="from-names">测试结果： </span>
+          <span class="from-names">测试结果：</span>
           <span class="from-value">通过</span>
         </el-col>
       </el-row>
@@ -34,7 +34,7 @@
           <span class="parent-style">计划准出时间：{{ fromCreateData.releasePlanTime }}</span>
         </el-col>
         <el-col :span="12">
-          <span class="parent-style"> 实际准出时间：{{ fromCreateData.releaseActualTime }}</span>
+          <span class="parent-style">实际准出时间：{{ fromCreateData.releaseActualTime }}</span>
         </el-col>
       </el-row>
 
@@ -46,19 +46,19 @@
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">计划开发周期：{{ fromCreateData.testPlanTimeStart }}</span>
+          <span class="parent-style">计划开发周期：{{ fromCreateData.devPlanTimeStart }} 至 {{ fromCreateData.devPlanTimeEnd }}</span>
         </el-col>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style"> 实际开发周期：{{ fromCreateData.testPlanTimeEnd }}</span>
+          <span class="parent-style">实际开发周期：{{ fromCreateData.devActualTimeStart }} 至 {{ fromCreateData.devActualTimeEnd }}</span>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">计划测试周期：{{ fromCreateData.testActualTimeStart }} </span>
+          <span class="parent-style">计划测试周期：{{ fromCreateData.testPlanTimeStart }} 至 {{ fromCreateData.testPlanTimeEnd }}</span>
         </el-col>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">实际测试周期：{{ fromCreateData.testActualTimeEnd }}</span>
+          <span class="parent-style">实际测试周期：{{ fromCreateData.testActualTimeStart }} 至 {{ fromCreateData.testActualTimeEnd }}</span>
         </el-col>
       </el-row>
 
@@ -67,7 +67,7 @@
           <span class="parent-style">开发人员：{{ fromCreateData.developer }}</span>
         </el-col>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style"> 测试人员：{{ fromCreateData.tester }}</span>
+          <span class="parent-style">测试人员：{{ fromCreateData.tester }}</span>
         </el-col>
       </el-row>
       <div v-html="fromCreateData.content" />
@@ -151,53 +151,53 @@ export default {
 
 <style lang="scss" scoped>
 .parent-style {
-    width: 100%;
-    display: inline-block;
-    font-size:14px;
-    font-family:Microsoft Sans Serif;
-    font-weight:400;
-    line-height:22px;
-    margin: 10px 0;
-    color:#666666;
-    opacity:1;
-    .from-value {
-      margin-left: 30px;
-      color:rgba(126,211,33,1);
-    }
-  .report-taskList{
-    font-size:14px;
-    font-family:MicrosoftYaHei;
-    line-height:17px;
-    color:rgba(102,102,102,1);
+  width: 100%;
+  display: inline-block;
+  font-size: 14px;
+  font-family: Microsoft Sans Serif;
+  font-weight: 400;
+  line-height: 22px;
+  margin: 10px 0;
+  color: #666666;
+  opacity: 1;
+  .from-value {
+    margin-left: 30px;
+    color: rgba(126, 211, 33, 1);
+  }
+  .report-taskList {
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    line-height: 17px;
+    color: rgba(102, 102, 102, 1);
     margin-top: 10px;
-    opacity:1;
+    opacity: 1;
   }
 }
 .div1 {
-    width: 60px;
-    font-size: 14px;
-    font-family: MicrosoftYaHei;
-    color: rgba(51, 51, 51, 1);
-    line-height: 19px;
+  width: 60px;
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51, 51, 51, 1);
+  line-height: 19px;
+}
+.backStyle {
+  color: #333;
+  font-size: 14px;
+  font-weight: bold;
+  border-radius: 4px;
+  margin: 10px 0;
+}
+.reportName {
+  font-size: 20px;
+  font-weight: bold;
+  border-radius: 4px;
+  margin: 20px 0;
+  color: #409eff;
+}
+.bottom_mar {
+  margin-bottom: 10px;
+}
+.Above {
+  margin-bottom: 20px;
 }
-  .backStyle {
-    color: #333;
-    font-size: 14px;
-    font-weight: bold;
-    border-radius: 4px;
-    margin: 10px 0;
-  }
-  .reportName {
-    font-size: 20px;
-    font-weight: bold;
-    border-radius: 4px;
-    margin: 20px 0;
-     color:#409EFF;
-  }
-  .bottom_mar {
-    margin-bottom: 10px;
-  }
-  .Above {
-    margin-bottom: 20px;
-  }
 </style>

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -155,7 +155,6 @@ export default {
       tasksOptions: [], // 关联任务
       tasksDetailList: [], // 关联任务
       selectTask: false,
-      judge: false,
       from: {
         reportName: ''
       },
@@ -193,8 +192,7 @@ export default {
         console.log(newV, '111111')
         if (newV[0]) {
           newV.map(item => {
-            this.judge = true
-            this.remoteMethod(item)
+            this.remoteMethod_data(item)
           })
           this.reportdelivertestInitReportRelease(newV)
         }
@@ -209,14 +207,12 @@ export default {
     async reportdelivertestGetReportById(val) { // 获取提测报告数据
       const res = await reportdelivertestGetReportById(val)
       if (res.code === 200) {
-        console.log(res.data, '2222')
         const from = res.data
         this.from.id = from.id
         this.$set(this.from, 'reportName', from.reportName) // 报告名称
         this.setFromData(from)
         res.data.taskIds.map(item => {
-          this.judge = true
-          this.remoteMethod(item)
+          this.remoteMethod_data(item)
         })
       }
     },
@@ -265,16 +261,16 @@ export default {
         this.$set(this.from, 'moduleName', res.data.moduleName)
       }
     },
+    async remoteMethod_data(query) { // 远程搜索任务
+      const res = await taskList({ name: query })
+      this.tasksDetailList.push(res.data[0])
+      this.taskId.push(res.data[0].id)
+    },
 
     async remoteMethod(query) { // 远程搜索任务
-      const res = await taskList({ bizId: Number(localStorage.getItem('bizId')), name: query })
+      const res = await taskList({ name: query })
       if (res.code === 200) {
         this.tasksOptions = res.data
-        if (this.judge) {
-          this.tasksDetailList.push(res.data[0])
-          this.taskId.push(res.data[0].id)
-          this.judge = false
-        }
       }
     },
 

src/views/reportManagement/daily/components/iconDisplay.vue

@@ -20,7 +20,7 @@
       <el-table-column prop="bugId" label="缺陷ID" align="center" min-width="80" />
       <el-table-column prop="bugName" label="缺陷标题" align="center" min-width="100">
         <template slot-scope="scope">
-          <span class="didi-hover" @click.stop="click_bugName(scope.row.id)">{{ scope.row.bugName }}</span>
+          <span class="didi-hover" @click.stop="click_bugName(scope.row.bugId)">{{ scope.row.bugName }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="bugStatusName" label="状态" align="center" min-width="100" />
@@ -84,7 +84,7 @@ export default {
   // },
   methods: {
     click_bugName(id) { // 缺陷跳转
-      this.$router.push({ name: '缺陷详情', params: { id: id }})
+      this.$router.push({ name: '缺陷详情', params: { id: Number(id.replace('BUG-', '')) }})
     },
 
     setReportData(val) {

src/views/reportManagement/daily/dailyPreview.vue

@@ -21,8 +21,9 @@
       <span>{{ item.name }}</span>
     </div>
 
+    <div class="backStyle marginTop">报告预览</div>
+
     <div id="repot-list" class="marginTop">
-      <div class="backStyle marginTop">报告预览</div>
       <div
         class="Layout_space_between reportName_style"
         style="border-bottom: 0.5px solid #eee;margin-bottom: 15px; padding-bottom: 10px;"

src/views/reportManagement/daily/dailyTemplate.vue

@@ -1,11 +1,6 @@
 <template>
   <!-- 新增测试日报 -->
-  <div
-    v-loading="loading"
-    class="parent-style"
-    element-loading-text="数据上传中，请稍后"
-    element-loading-spinner="el-icon-loading"
-  >
+  <div v-loading="loading" class="parent-style" element-loading-text="数据上传中，请稍后" element-loading-spinner="el-icon-loading">
     <el-form ref="fromCreateData" class="dailyFrom" :model="fromCreateData" :rules="serviceDataRules">
 
       <div style=" margin-bottom: 10px;">
@@ -35,7 +30,6 @@
         <normal-area id="report-template" :value.sync="fromCreateData.content" :height="500" />
       </el-form-item>
     </el-form>
-
     <icon-display :details="taskid_arr" />
   </div>
 </template>
@@ -197,33 +191,33 @@ export default {
 .dailyFrom {
   >>> .el-form-item {
     margin-bottom: 0px;
-}
->>> .el-form-item__label {
+  }
+  >>> .el-form-item__label {
     color: #333;
-}
+  }
 }
 .parent-style {
-  .report-taskList{
-    font-size:14px;
-    font-family:MicrosoftYaHei;
-    line-height:17px;
-    color:rgba(102,102,102,1);
+  .report-taskList {
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    line-height: 17px;
+    color: rgba(102, 102, 102, 1);
     margin-top: 10px;
-    opacity:1;
+    opacity: 1;
   }
 }
-  .backStyle {
-     color: #333;
-    font-size: 14px;
-    font-weight: bold;
-    border-radius: 4px;
-    margin: 10px 0;
-  }
+.backStyle {
+  color: #333;
+  font-size: 14px;
+  font-weight: bold;
+  border-radius: 4px;
+  margin: 10px 0;
+}
 
-  .taskError {
-    color: #F56C6C;
-    font-size: 12px;
-    line-height: 1;
-    padding-top: 4px;
-  }
+.taskError {
+  color: #f56c6c;
+  font-size: 12px;
+  line-height: 1;
+  padding-top: 4px;
+}
 </style>