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

# Conflicts:
#	src/views/reportManagement/daily/dailyTemplate.vue

src/components/input/normalArea.vue

@@ -67,10 +67,6 @@ export default {
   mounted() {
     tinymce.init({ selector: `#tinymce_${this.id}` })
   },
-  beforeDestroy() {
-    // 销毁编辑器
-    this.editor.remove()
-  },
   methods: {
     changeText(e) { // 富文本内容改变
       this.inputValue = e

src/views/projectManage/taskList/components/reportList.vue

@@ -20,6 +20,7 @@
             <template slot-scope="scope">
               <a v-if="dataStatus" href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 2)">{{ scope.row.reportName }}</a>
               <a v-if="!dataStatus" href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 2)">{{ scope.row.name }}</a>
+              <br>{{ scope.row.returnReason }}
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="100" align="center">
@@ -372,8 +373,8 @@ export default {
           bizId: this.reportData.bizId,
           taskIds: [this.taskId],
           reportName: this.reportData.reportName,
-          returnReason: this.reportData.reason,
-          status: this.Str === '打回' ? 2 : this.Str === '通过' ? 1 : ''
+          returnReason: this.launchRepulseInfo,
+          status: this.Str === '打回' ? 2 : 1
         }
         const res = await reportdelivertestUpdate(data)
         if (res.code === 200) {

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

@@ -56,7 +56,7 @@
           </el-col>
         </el-row>
 
-        <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>
           </el-col>
@@ -65,6 +65,8 @@
           </el-col>
         </el-row>
         <div v-html="details.content" />
+
+        <div class="title"> 缺陷统计</div>
         <icon-display :task-ids="details.statusString === '已发送' ? details : details.taskIds" />
       </el-main>
       <el-aside width="400px">

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -24,7 +24,7 @@
           <el-date-picker v-model="from.releasePlanTime" :disabled="releaseType" type="date" placeholder="选择日期时间" format="yyyy.MM.dd" value-format="yyyy.MM.dd" style="width: 100%;" size="small" />
         </el-col>
         <el-col :span="12">
-          <span class="from-namer"> 实际准出时间：{{ from.releaseActualTime }}</span>
+          <span class="from-namer"> 实际准出时间：<span :class="{'sodu': releaseType}">{{ releaseType ? '自动填入' : from.releaseActualTime }}</span></span>
         </el-col>
       </el-row>
 
@@ -101,6 +101,7 @@ export default {
       content: {}, // from
       from: {}, // from-date
       fromData: {},
+      modelID: '',
       releaseType: false // 新建模版还是新建准出报告
     }
   },
@@ -110,14 +111,20 @@ export default {
         if (newV === '新建模版') {
           this.releaseType = true
         } else {
-          if (newV.id) {
-            this.reportId = newV.id
-            this.reportreleaseGetReportById(newV.id)
+          this.releaseType = false
+          if (newV.set_up) {
+            this.releaseType = true
+            this.settingGetReportModuleById(newV.set_up)
           } else {
-            this.tpsltId = newV
-            this.settingGetReportModuleById(newV)
+            this.releaseType = false
+            if (newV.id) {
+              this.reportId = newV.id
+              this.reportreleaseGetReportById(newV.id)
+            } else {
+              this.tpsltId = newV
+              this.settingGetReportModuleById(newV)
+            }
           }
-          this.releaseType = false
         }
       },
       immediate: true
@@ -144,9 +151,11 @@ export default {
     },
 
     async reportreleaseInitReportRelease() { // 获取表单数据
-      const res = await reportreleaseInitReportRelease({ taskIds: this.taskId })
-      if (res.code === 200) {
-        this.setDefaultData(res.data)
+      if (!this.releaseType) {
+        const res = await reportreleaseInitReportRelease({ taskIds: this.taskId })
+        if (res.code === 200) {
+          this.setDefaultData(res.data)
+        }
       }
     },
 
@@ -185,7 +194,8 @@ export default {
       const res = await settingGetReportModuleById(val)
       if (res.code === 200) {
         this.fromData = res.data
-        console.log(res.data)
+        this.modelID = res.data.id
+        this.$set(this.from, 'moduleName', res.data.moduleName)
       }
     },
 
@@ -280,7 +290,7 @@ export default {
     },
 
     // 新建模版
-    getCreateData() {
+    getCreateData(e) {
       this.$refs.fromCreateData.validate((valid) => {
         if (valid) {
           const data = {}
@@ -288,18 +298,19 @@ export default {
           data.content = this.fromData.content
           data.moduleName = this.from.moduleName
           data.type = 4 // 准出报告 4
-          if (this.tpltId) {
-            settingUpdateReportModule(data).then(res => {
+          if (e === '新建模版') {
+            settingAddReportModule(data).then(res => {
               if (res.code === 200) {
-                this.$message({ type: 'success', message: '更新成功' })
+                this.$message({ type: 'success', message: '创建成功' })
                 this.$emit('getreportTemplate')
                 this.$emit('reportReturn')
               }
             })
           } else {
-            settingAddReportModule(data).then(res => {
+            data.id = this.modelID
+            settingUpdateReportModule(data).then(res => {
               if (res.code === 200) {
-                this.$message({ type: 'success', message: '创建成功' })
+                this.$message({ type: 'success', message: '更新成功' })
                 this.$emit('getreportTemplate')
                 this.$emit('reportReturn')
               }
@@ -345,6 +356,10 @@ export default {
       color:rgba(126,211,33,1);
     }
 }
+.sodu {
+  color:#C0C4CC;
+  margin-left: 10px;
+}
 
   .from-margin {
     margin-bottom:20px;

src/views/reportManagement/Testing/TestingPreview.vue

@@ -67,14 +67,18 @@
         style="width: 100%; margin-bottom: 20px;"
         show-overflow-tooltip="true"
       >
-        <el-table-column prop="bugName" label="需求" align="center" min-width="250" show-overflow-tooltip>
+        <el-table-column prop="name" label="需求" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span class="didi-hover">{{ scope.row.bugName }}</span>
+            <span class="didi-hover" @click="goRequired(scope.row.id)">{{ scope.row.name }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="priorityLevel" label="优先级" align="center" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="priorityName" label="PM" 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="priorityName" label="优先级" min-width="100" show-overflow-tooltip />
+        <el-table-column label="PM" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span class="didi-hover">{{ scope.row.pmMemberInfoResponse.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="referredClientTypeName" label="跟版客户端" min-width="90" show-overflow-tooltip />
       </el-table>
 
       <div v-html="fromCreateData.content" />
@@ -136,6 +140,10 @@ export default {
       }
     },
 
+    goRequired(id) {
+      this.$router.push({ name: '需求详情', query: { id: id }})
+    },
+
     sendReport() {
       if (this.form.name !== undefined) {
         setTimeout(() => {

src/views/reportManagement/Testing/components/deliverDetails.vue

@@ -71,14 +71,18 @@
           style="width: 100%; margin-bottom: 20px;"
           show-overflow-tooltip="true"
         >
-          <el-table-column prop="bugName" label="需求" align="center" min-width="250" show-overflow-tooltip>
+          <el-table-column prop="name" label="需求" min-width="250" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span class="didi-hover">{{ scope.row.bugName }}</span>
+              <span class="didi-hover" @click="goRequired(scope.row.id)">{{ scope.row.name }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="priorityLevel" label="优先级" align="center" min-width="100" show-overflow-tooltip />
-          <el-table-column prop="priorityName" label="PM" 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="priorityName" label="优先级" min-width="100" show-overflow-tooltip />
+          <el-table-column label="PM" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span class="didi-hover">{{ scope.row.pmMemberInfoResponse.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="referredClientTypeName" label="跟版客户端" min-width="90" show-overflow-tooltip />
         </el-table>
 
         <div v-html="details.content" />
@@ -173,7 +177,7 @@ export default {
     async reportdelivertestGetRequiresByTaskIds(val) {
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })
       if (res2.code === 200) {
-        this.tableData = res2.data.list
+        this.tableData = res2.data
       }
     },
 
@@ -211,6 +215,9 @@ export default {
         }
       }
     },
+    goRequired(id) {
+      this.$router.push({ name: '需求详情', query: { id: id }})
+    },
 
     goTaskDetails(id) {
       this.$router.push({ name: '任务详情', query: { id: id }})

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -25,7 +25,7 @@
           />
         </el-col>
         <el-col :span="12">
-          <span class="from-namev"> 实际提测时间：{{ from.deliverTestActualTime }}</span>
+          <span class="from-namev"> 实际提测时间：<span :class="{'sodu': releaseType}">{{ releaseType ? '自动填入' : from.deliverTestActualTime }}</span></span>
         </el-col>
       </el-row>
 
@@ -90,14 +90,18 @@
       style="width: 100%; margin-bottom: 20px;"
       show-overflow-tooltip="true"
     >
-      <el-table-column prop="bugName" label="需求" align="center" min-width="250" show-overflow-tooltip>
+      <el-table-column prop="name" label="需求" min-width="250" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span class="didi-hover">{{ scope.row.bugName }}</span>
+          <span class="didi-hover" @click="goRequired(scope.row.id)">{{ scope.row.name }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="priorityLevel" label="优先级" align="center" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="priorityName" label="PM" 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="priorityName" label="优先级" min-width="100" show-overflow-tooltip />
+      <el-table-column label="PM" min-width="100" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span class="didi-hover">{{ scope.row.pmMemberInfoResponse.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="referredClientTypeName" label="跟版客户端" min-width="90" show-overflow-tooltip />
     </el-table>
 
     <normal-area id="report-template" :value.sync="fromCreateData.content" :height="500" />
@@ -141,12 +145,18 @@ export default {
           this.releaseType = true
         } else {
           this.releaseType = false
-          if (newV.id) {
-            this.tpltId = newV.moduleId
-            this.reportdelivertestGetReportById(newV.id)
+          if (newV.repot_up) {
+            this.releaseType = true
+            this.settingGetReportModuleById(newV.repot_up)
           } else {
-            this.tpltId = newV
-            this.tpltId ? this.settingGetReportModuleById(newV) : ''
+            this.releaseType = false
+            if (newV.id) {
+              this.tpltId = newV.moduleId
+              this.reportdelivertestGetReportById(newV.id)
+            } else {
+              this.tpltId = newV
+              this.tpltId ? this.settingGetReportModuleById(newV) : ''
+            }
           }
         }
       },
@@ -177,10 +187,10 @@ export default {
         this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
         this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
         this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
-        this.$set(this.from, 'involveApp', from.involveApp) // 跟版客户端
         this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
         this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0：否 1：是
         this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
+        this.$set(this.from, 'involveApp', Number(from.involveApp)) // 跟版客户端
       }
     },
 
@@ -193,9 +203,9 @@ export default {
         this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
         this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
         this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
-        this.$set(this.from, 'involveApp', from.involveApp) // 跟版客户端
         this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
         this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0：否 1：是
+        this.$set(this.from, 'involveApp', Number(from.involveApp)) // 跟版客户端
         this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
       }
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })
@@ -210,13 +220,19 @@ export default {
         this.appClient = res.data.appClient // 涉及客户端
       }
     },
+
     async settingGetReportModuleById(val) { // 获取自定义模版内容
       const res = await settingGetReportModuleById(val)
       if (res.code === 200) {
         this.fromCreateData = res.data
+        this.$set(this.from, 'moduleName', res.data.moduleName)
       }
     },
 
+    goRequired(id) {
+      this.$router.push({ name: '需求详情', query: { id: id }})
+    },
+
     // 创建提测报告
     reportreleaseCreate(val) {
       this.$refs.fromCreateData.validate((valid) => {
@@ -287,19 +303,19 @@ export default {
         if (valid) {
           this.fromCreateData.bizId = localStorage.getItem('bizId')
           this.fromCreateData.moduleName = this.from.moduleName
-          this.fromCreateData.type = e
-          if (this.tpltId) {
-            settingUpdateReportModule(this.fromCreateData).then(res => {
+          this.fromCreateData.type = 1
+          if (e === '新建模版') {
+            settingAddReportModule(this.fromCreateData).then(res => {
               if (res.code === 200) {
-                this.$message({ type: 'success', message: '更新成功' })
+                this.$message({ type: 'success', message: '创建成功' })
                 this.$emit('getreportTemplate')
                 this.$emit('reportReturn')
               }
             })
           } else {
-            settingAddReportModule(this.fromCreateData).then(res => {
+            settingUpdateReportModule(this.fromCreateData).then(res => {
               if (res.code === 200) {
-                this.$message({ type: 'success', message: '创建成功' })
+                this.$message({ type: 'success', message: '更新成功' })
                 this.$emit('getreportTemplate')
                 this.$emit('reportReturn')
               }
@@ -345,6 +361,10 @@ export default {
       vertical-align: sub;
     }
 }
+.sodu {
+  color:#C0C4CC;
+  margin-left: 10px;
+}
 
   .from-margin {
     margin-bottom:20px;

src/views/reportManagement/components/DailyReport.vue

@@ -13,35 +13,37 @@
       <div v-if="showOne" style="min-height: 34vh;">
         <el-row type="flex" justify="center">
           <el-col :span="19" class="creator">模版名称</el-col>
-          <el-col :span="5" class="creator">创建人</el-col>
+          <el-col :span="5" class="creator" style="margin-right: 17px;"> 创建人 </el-col>
         </el-row>
 
-        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden">
-          <el-row v-for="(item, index) in selectTemplate" :key="index" type="flex" justify="center">
+        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden; margin: 20px 0;">
+          <el-row v-for="(item, index) in selectTemplate" :key="index" type="flex" justify="center" style="padding-right: 15px;">
             <el-col :span="19">
               <el-radio v-model="fromData.radio" class="creatorList" :label="item.id">{{ item.moduleName }}</el-radio>
             </el-col>
             <el-col :span="5" class="creatorList">
-              {{ item.creatorObject.name }}
-              <span v-if="item.creator !== 'SYSTEM' && item.creator !== '系统'" class="operation">
-                <i class="el-icon-edit-outline didi-hover" @click="open_new_template(item)" />
-                <el-popover :ref="item.id" placement="bottom" width="300" :visible-arrow="false" trigger="click">
-                  <div><div class="blur-column" /> 删除模版</div>
-                  <div class="blueStripe" />
-                  <div class="deletreport">是否要删除模版{{ item.moduleName }}?</div>
-                  <div style="text-align: right; margin: 0">
-                    <el-button size="mini" type="danger" @click="settingDeleteReportModule(item)">确定</el-button>
-                    <el-button size="mini" @click="closeDefaultPopover()">取消</el-button>
-                  </div>
-                  <i slot="reference" class="el-icon-delete reportModel didi-hover" />
-                </el-popover>
-              </span>
+              <div class="Layout_space_between">
+                <span>{{ item.creatorObject.name }}</span>
+                <span v-if="item.creator !== 'SYSTEM' && item.creator !== '系统'" class="operation">
+                  <i class="el-icon-edit-outline didi-hover" @click="open_new_template(item)" />
+                  <el-popover :ref="item.id" placement="bottom" width="300" :visible-arrow="false" trigger="click">
+                    <div><div class="blur-column" /> 删除模版</div>
+                    <div class="blueStripe" />
+                    <div class="deletreport">是否要删除模版{{ item.moduleName }}?</div>
+                    <div style="text-align: right; margin: 0">
+                      <el-button size="mini" type="danger" @click="settingDeleteReportModule(item)">确定</el-button>
+                      <el-button size="mini" @click="closeDefaultPopover()">取消</el-button>
+                    </div>
+                    <i slot="reference" class="el-icon-delete reportModel didi-hover" />
+                  </el-popover>
+                </span>
+              </div>
             </el-col>
           </el-row>
         </div>
         <el-row type="flex" justify="center">
           <el-col :span="24">
-            <span class="didi-hover" @click="open_new_template()"><i class="el-icon-circle-plus-outline creatorList didi-hover" /> <span style="margin-left: 8px">新建模版</span></span>
+            <span class="didi-hover" @click="open_new_template()"><i class="el-icon-circle-plus-outline creatorList didi-hover" /> <span style="margin-left: 8px; color: #333;">新建模版</span></span>
           </el-col>
         </el-row>
       </div>
@@ -276,7 +278,7 @@ export default {
 
 <style lang="scss" scoped>
 .report-leftRight {
-  margin: 20px 8% 0;
+  margin: 20px 9% 0%;
   >>> .el-row .el-col {
     margin: 0;
   }
@@ -317,7 +319,7 @@ export default {
   font-size:14px;
   font-family:Microsoft Sans Serif;
   font-weight:400;
-  line-height: 2.8;
+  margin-bottom: 15px;
   color:rgba(51,51,51,1);
   opacity:1;
 }

src/views/reportManagement/components/ReleaseReport.vue

@@ -16,7 +16,7 @@
           <el-col :span="5" class="creator">创建人</el-col>
         </el-row>
 
-        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden">
+        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden; margin: 30px 0;">
           <el-row v-for="(item, index) in selectTemplate" :key="index" type="flex" justify="center" @mouseover.native="item.operation = true" @mouseleave.native="item.operation = false">
             <el-col :span="19">
               <el-radio v-model="fromData.radio" class="creatorList" :label="item.id">{{ item.moduleName }}</el-radio>
@@ -142,6 +142,7 @@ export default {
           this.newDailyTemplate = true // 展示第二步
           this.dailyPreview = false // 隐藏第三部
           this.updateDaily = true // 编辑
+          this.reportTamplate = false // 隐藏模版
           break
         case 3: // 发送报告
           this.dailyId = newData.id
@@ -171,12 +172,8 @@ export default {
       }
     },
 
-    report_update() { // 编辑模版
-      this.$refs.DailyReport.getQueryData(4)
-    },
-
     created_out() { // 新建模版
-      this.$refs.newReleaeTemplate.getCreateData(4)
+      this.$refs.newReleaeTemplate.getCreateData(this.templateId)
     },
 
     reportReturn() { // 新建模版点击返回
@@ -188,7 +185,8 @@ export default {
     },
 
     open_new_template(val) { // 点击新建模版
-      val ? this.templateId = val.id : this.templateId = '新建模版'
+      const set_up = val !== undefined ? { set_up: val.id } : ''
+      val !== undefined ? this.templateId = set_up : this.templateId = '新建模版'
       if (this.templateId === '新建模版') {
         this.reportTamplate = true // 编辑区域
         this.reportHome = false // 步骤条
@@ -271,7 +269,7 @@ export default {
 
 <style lang="scss" scoped>
 .report-leftRight {
-  margin: 0 8%;
+  margin: 20px 9% 0%;
   >>> .el-row .el-col {
     margin: 0;
 }

src/views/reportManagement/components/TestingReport.vue

@@ -89,7 +89,7 @@ export default {
   data() {
     return {
       reportHome: true, // 报告主页
-      templateId: '', // 模版id
+      templateId: {}, // 模版id
       modelId: '', // 下一步选择的模版id
       selectTemplate: [], // 模版option
       fromData: {
@@ -175,12 +175,8 @@ export default {
       }
     },
 
-    report_update() { // 编辑模版
-      this.$refs.DailyReport.getQueryData(1)
-    },
-
     created_out() { // 新建模版
-      this.$refs.newReportTemplate.getCreateData(1)
+      this.$refs.newReportTemplate.getCreateData(this.templateId)
     },
 
     reportReturn() { // 新建模版点击返回
@@ -192,7 +188,8 @@ export default {
     },
 
     open_new_template(val) { // 点击新建模版
-      val ? this.templateId = val.id : this.templateId = '新建模版'
+      const repot_up = val !== undefined ? { repot_up: val.id } : ''
+      val !== undefined ? this.templateId = repot_up : this.templateId = '新建模版'
       if (this.templateId === '新建模版') {
         this.reportTamplate = true // 编辑区域
         this.reportHome = false // 步骤条

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

@@ -9,13 +9,13 @@
       <el-table-column prop="Reopen" label="Reopen" align="center" min-width="100" />
       <el-table-column prop="Hold" label="Hold" align="center" min-width="100" />
     </el-table>
-    <div class="backStyle">今日新增缺陷（-个）</div>
+    <div class="backStyle">今日新增缺陷（ {{ DataByPri }} 个）</div>
     <div :id="'line-echarts' + randomId" class="line-echarts" />
     <div class="Layout_space_between">
       <div :id="'lineShow' + randomId" class="backTop" />
       <div :id="'barShow' + randomId" class="backTop" />
     </div>
-    <div class="backStyle">P0&P1缺陷列表（-个）</div>
+    <div class="backStyle">P0&P1缺陷列表（ {{ PriData || 0 }} 个）</div>
     <el-table :data="report_bugList" border size="mini" style="width: 100%" show-overflow-tooltip="true" :header-cell-style="{ backgroundColor: 'rgba(241,241,241,1)', color: 'rgba(51,59,74,1)', fontSize: '14px', fontWeight: '400'}">
       <el-table-column prop="bugId" label="缺陷ID" align="center" min-width="80" show-overflow-tooltip />
       <el-table-column prop="bugName" label="缺陷标题" align="center" min-width="100" show-overflow-tooltip>
@@ -46,6 +46,8 @@ export default {
       tableList: [], // 缺陷统计
       report_bugList: [], // P0&P1缺陷列表
       taskid_arr: [],
+      DataByPri: '',
+      PriData: '',
       randomId: Math.floor(Math.random() * 10)
     }
   },
@@ -163,6 +165,7 @@ export default {
       const res1 = await bugGetReportHighPriData(data) // 获取P0&P1缺陷列表
       if (res1.code === 200) {
         this.report_bugList = res1.data
+        this.PriData = res1.total
       }
 
       const res6 = await bugGetReportDisDataByDate({ taskIds: this.taskid_arr })
@@ -207,6 +210,7 @@ export default {
       }
       const res3 = await bugGetReportDisDataByPri(data) // 获取缺陷等级分布
       if (res3.code === 200) {
+        this.DataByPri = res3.total
         const data = res3.data.yaxis.map(item => ({
           ...item,
           type: 'bar',
@@ -236,6 +240,9 @@ export default {
     font-weight: bold;
     border-radius: 4px;
     margin: 10px 0;
+    color: #333;
+    line-height: 40px;
+    margin-top: 20px;
   }
   .line-echarts {
      width: 100%;

src/views/reportManagement/daily/dailyPreview.vue

@@ -11,14 +11,16 @@
       <searchTeam :value.sync="form.names" :clearable="true" :multiple="true" style="width:100%" />
     </div>
 
-    <div id="repot-list">
+    <div id="repot-list" class="marginTop">
       <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="Layout_space_between">
-        <span class="backStyle report-name" style="font-size: 20px"> {{ fromCreateData.reportName }}</span>
+
+      <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;">
+        <span class="backStyle report-name"> {{ fromCreateData.reportName }}</span>
         <span>报告人：{{ name }}</span>
       </div>
       <div v-html="fromCreateData.content" />
@@ -104,13 +106,14 @@ export default {
     font-size:14px;
     font-family:MicrosoftYaHei;
     line-height:17px;
-    color:rgba(102,102,102,1);
-    margin: 10px 0 0 20px;
+    color:#333;
+    margin: 10px 0 0 0;
     opacity:1;
   }
   .report-name {
     font-size: 20px;
     margin-top: 15px;
+    color:#409EFF;
   }
 }
 .div1 {
@@ -121,12 +124,19 @@ export default {
     line-height: 19px;
 }
   .backStyle {
+    color:#333;
     font-size: 14px;
     font-weight: bold;
-    border-radius: 4px;
-    margin: 10px 0;
   }
   .report-div {
-    margin: 0 0 10px 20px;
+    margin-top: 10px;
+  }
+  .marginTop {
+    margin-top: 30px;
+  }
+  .reportName_style {
+    border-bottom: 0.5px solid #eee;
+    margin-bottom: 15px;
+    padding-bottom: 10px;
   }
 </style>

src/views/reportManagement/daily/dailyTemplate.vue

@@ -1,31 +1,26 @@
 <template>
   <!-- 新增测试日报 -->
   <div
-    v-loading.fullscreen.lock="loading"
+    v-loading="loading"
+    class="parent-style"
     element-loading-text="数据上传中，请稍后"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
-    class="parent-style"
-  >>
-    <el-form
-      ref="fromCreateData"
-      class="dailyFrom"
-      :model="fromCreateData"
-      :rules="serviceDataRules"
-    >
-      <div class="Layout_space_between">
-        <div>
-          <span style="color: #f56b6c">*</span>
-          <span class="backStyle"> 关联任务</span>
-        </div>
-
-        <el-select v-model="fromCreateData.taskIds" filterable remote reserve-keyword placeholder="请输入任务名称或ID" :remote-method="remoteMethod" style="width: 30%" size="small" @change="colseSelect">
-          <el-option v-for="item in tasksOptions" :key="item.id" :label="item.name" :value="item.id" @click.native="tasksChange(item)">
-            <div class="Layout_space_between"><span>{{ item.name }}</span></div>
-          </el-option>
-        </el-select>
+  >
+    <el-form ref="fromCreateData" class="dailyFrom" :model="fromCreateData" :rules="serviceDataRules">
+
+      <div style=" margin-bottom: 10px;">
+        <span style="color: #f56b6c">*</span>
+        <span class="backStyle"> 关联任务</span>
       </div>
-      <div v-if="selectTask" class="taskError">任务名称不能为空</div>
+
+      <el-select v-model="fromCreateData.taskIds" filterable remote reserve-keyword placeholder="🔍 请输入任务名称或ID" :remote-method="remoteMethod" style="width: 30%" size="small" @change="colseSelect">
+        <el-option v-for="item in tasksOptions" :key="item.id" :label="item.name" :value="item.id" @click.native="tasksChange(item)">
+          <div class="Layout_space_between"><span>{{ item.name }}</span></div>
+        </el-option>
+      </el-select>
+
+      <div v-if="selectTask" class="taskError">报告关联任务不能为空</div>
 
       <div v-for="(item, index) in tasksDetailList" :key="index" class="Layout_space_between report-taskList">
         <span>{{ item.taskIdSting }}</span>
@@ -33,11 +28,11 @@
         <i class="el-icon-circle-close didi-hover" @click="delete_task(item)" />
       </div>
 
-      <el-form-item label="标题" prop="reportName"><br>
+      <el-form-item label="标题" prop="reportName" style="margin-top: 20px;"><br>
         <el-input v-model="fromCreateData.reportName" type="text" maxlength="50" size="small" style="width: 100%;" placeholder="请输入报告名称" />
       </el-form-item>
 
-      <el-form-item label="报告内容"><br>
+      <el-form-item label="报告内容" style="margin-top: 20px;"><br>
         <normal-area id="report-template" :value.sync="fromCreateData.content" :height="500" />
       </el-form-item>
     </el-form>
@@ -82,11 +77,10 @@ export default {
   watch: {
     modelId: {
       handler(newV) {
-        console.log(newV, 'xsaxnioa')
         if (newV.id) {
           this.fromCreateData = newV
           if (this.fromCreateData.updateDaily === false) {
-            this.$set(this.fromCreateData, 'reportName', ' ')
+            this.$set(this.fromCreateData, 'reportName', '')
           }
           this.$set(this.fromCreateData, 'taskIds', null)
           this.moduleId = this.fromCreateData.moduleId
@@ -206,6 +200,9 @@ export default {
   >>> .el-form-item {
     margin-bottom: 0px;
 }
+>>> .el-form-item__label {
+    color: #333;
+}
 }
 .parent-style {
   .report-taskList{
@@ -218,6 +215,7 @@ export default {
   }
 }
   .backStyle {
+     color: #333;
     font-size: 14px;
     font-weight: bold;
     border-radius: 4px;