ss

src/views/quality/components/drawerAll.vue

@@ -91,6 +91,10 @@ export default {
     data: {
       handler(newV, oldV) {
         if (newV) {
+<<<<<<< HEAD
+=======
+          // console.log(newV, this.drawer, '刚进来')
+>>>>>>> 34a9fef375c066f17db37312266bcd1b7c76a7ce
           this.Statistics = newV
           this.list = newV.xaxis
           this.type = newV.name
@@ -275,7 +279,7 @@ export default {
 }
 .fontSize {
   color: #333333;
-  font-weight: 500;
+  font-weight: 600;
 }
 >>> :focus{outline:0;}
 >>>.el-table::before {

src/views/quality/components/tables/index.vue

@@ -48,11 +48,9 @@
     </el-table>
 
     <el-table v-if="title === '去除节假日的修复时长区间数据' || title === '不去除节假日的修复时长区间数据'" :data="data" style="width: auto;" height="calc(100vh - 355px)" :header-cell-style="{ 'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }">
-      <el-table-column label="优先级" prop="priorityCode" min-width="80" align="left">
+      <el-table-column label="缺陷等级" min-width="80" align="left">
         <template slot-scope="scope" style="text-align: center;">
-          <span class="div_priority" :class="[{'priority_color': scope.row.priorityLevel === 'High'},{'priority_color1': scope.row.priorityLevel === 'Medium'},{'priority_color3': scope.row.priorityLevel === 'Low'}]">
-            {{ scope.row.priorityLevel.substring(0, 1) }}
-          </span>
+          <span class="div_priority" :style="{background: priorityColors[scope.row.priority % priorityColors.length]}">{{ scope.row.priorityName }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="bugName" label="缺陷名称" min-width="200" align="left" show-overflow-tooltip>
@@ -71,15 +69,17 @@
           {{ scope.row.devFixTimePurgeNH/(1000 * 3600) | numFilter }}
         </template>
       </el-table-column>
-      <el-table-column prop="bugStatusName" label="状态" min-width="100" align="center" />
+      <el-table-column prop="bugStatusName" label="状态" min-width="100" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.bugStatusName }}
+        </template>
+      </el-table-column>
     </el-table>
 
     <el-table v-if="title === '分布图数据' || title === '去除节假日的修复时长数据' || title === '模块分布数据' || title === '缺陷统计数据'" :data="data" style="width: auto;" :height="title === '模块分布数据' ? 'calc(100vh - 175px)': 'calc(100vh - 318px)'" :header-cell-style="{ 'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }">
-      <el-table-column label="优先级" prop="priorityCode" min-width="80" align="left">
+      <el-table-column label="缺陷等级" min-width="80" align="left">
         <template slot-scope="scope" style="text-align: center;">
-          <span class="div_priority" :class="[{'priority_color': scope.row.priorityLevel === 'High'},{'priority_color1': scope.row.priorityLevel === 'Medium'},{'priority_color3': scope.row.priorityLevel === 'Low'}]">
-            {{ scope.row.priorityLevelShortName }}
-          </span>
+          <span class="div_priority" :style="{background: priorityColors[scope.row.priority % priorityColors.length]}">{{ scope.row.priorityName }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="bugName" label="缺陷名称" min-width="200" align="left" show-overflow-tooltip>
@@ -98,19 +98,14 @@
           {{ scope.row.devFixTimePurgeNH/(1000 * 3600) | numFilter }}
         </template>
       </el-table-column>
-      <el-table-column v-if="type === '缺陷状态' || type === '优先级' || title === '缺陷统计数据' " prop="bugStatusName" label="状态" min-width="100" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.bugStatusName }}
-        </template>
+      <el-table-column v-if="type === '端类型' || type === '发现方式' || type === '发现阶段' || type === '缺陷类型'" :label="type" min-width="100" align="center">
+        {{ oftype }}
       </el-table-column>
-      <el-table-column v-if="type === '缺陷等级'" prop="bugStatusName" label="缺陷等级" min-width="100" align="center">
+      <el-table-column prop="bugStatusName" label="状态" min-width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.priorityName }}
+          {{ scope.row.bugStatusName }}
         </template>
       </el-table-column>
-      <el-table-column v-if="type === '端类型' || type === '发现方式' || type === '发现阶段' || type === '缺陷类型'" :label="type" min-width="100" align="center">
-        {{ oftype }}
-      </el-table-column>
     </el-table>
 
     <el-table v-if="title === '报告统计数据'" :data="data" style="width: auto;" height="calc(100vh - 296px)" :header-cell-style="{ 'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }">

src/views/quality/defectStatistics.vue

@@ -605,18 +605,21 @@ export default {
       value.title = '分布图数据'
       this.requireList = { ...value, ...this.chart1Data }
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'bug_statistic_distribution_map' })
     },
     cilckRepairTimeListNoHoliday(value, data) {
       value.title = '去除节假日的修复时长数据'
       value.xaxis = ['全部', 'P0', 'P1', 'P2', 'P3']
       this.requireList = { ...value, ...data }
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'bug_statistic_remove_holiday_repair_time' })
     },
     getModuleData(value) {
       value.title = '模块分布数据'
       value.xaxis = ['全部', 'P0', 'P1', 'P2', 'P3']
       this.requireList = { ...value }
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'bug_statistic_module_distribution' })
     },
     getHoliday(value) {
       value.title = `${this.holiday}的修复时长区间数据`

src/views/quality/requireStatistics.vue

@@ -562,12 +562,14 @@ export default {
       value.xaxis = ['全部', 'P0', 'P1', 'P2', 'P3']
       this.requireList = value
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'requirement_statistic_defect_statistics' })
     },
     clickCodeData(value) {
       value.title = '需求分布图数据'
       value.toType = '需求'
       this.requireList = { ...value, ...this.distributeData }
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'requirement_statistic_demand_distribution' })
     },
     statusStayChart(value, list, data) {
       value.title = '状态停留分布图数据'
@@ -576,6 +578,7 @@ export default {
       value.statusList = data
       this.requireList = { ...value, xaxis: data.xaxis }
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'requirement_statistic_state_stay' })
     },
     clone(v) {
       this.drawer = v

src/views/quality/taskStatistics.vue

@@ -574,18 +574,21 @@ export default {
       value.xaxis = ['全部', 'P0', 'P1', 'P2', 'P3']
       this.requireList = value
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'task_defect_statistics_data' })
     },
     clickCount(value, data) {
       value.title = '报告统计数据'
       value.xaxis = ['全部', '提测报告', '测试日报', '准出报告']
       this.requireList = { ...value, reportData: data }
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'task_report_statistics_data' })
     },
     getTaskDat(value) {
       value.title = '任务分布图数据'
       value.toType = '任务'
       this.requireList = { ...value, ...this.distributeData }
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'task_distribution_data' })
     },
     statusStayChart(value, list, data) {
       value.title = '状态停留分布图数据'
@@ -594,6 +597,7 @@ export default {
       value.statusList = data
       this.requireList = { ...value, xaxis: data.xaxis }
       this.openDrawer = true
+      window.log({ c: 'statistic', d: 'task_state_stay_data' })
     },
     clone(v) {
       this.drawer = v