From af51566c3f3bf2d51047ce99db6a35b1ea1d6c2b Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 22 Apr 2024 16:48:18 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=BC=82=E5=B8=B8=E7=8E=87?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings.js                               |  2 +-
 .../downgradeProportionReport/index.vue       | 34 +++++++++++++------
 .../report/electricalInspection/index.vue     | 24 ++++++-------
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/settings.js b/src/settings.js
index 6a0b09f..fd24806 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -12,7 +12,7 @@ module.exports = {
   /**
    * 是否显示顶部导航
    */
-  topNav: false,
+  topNav: true,
 
   /**
    * 是否显示 tagsView
diff --git a/src/views/report/downgradeProportionReport/index.vue b/src/views/report/downgradeProportionReport/index.vue
index c322fbf..a1c2cff 100644
--- a/src/views/report/downgradeProportionReport/index.vue
+++ b/src/views/report/downgradeProportionReport/index.vue
@@ -11,6 +11,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="异常类型">
+        <el-select v-model="queryParams.alarmType" placeholder="请选择异常类型" >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.key"
+            :label="item.label"
+            :value="item.key"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="日期类型">
         <el-select v-model="queryParams.dateType" placeholder="请选择日期类型" >
           <el-option
@@ -48,7 +58,7 @@
           type="info"
           plain
           size="mini"
-        >样品机数：{{ totalSum }}
+        >异常数：{{ totalSum }}
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -68,9 +78,9 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="日期" align="center" prop="INSPECTOR_TIME" v-if="columns[1].visible"/>
-      <el-table-column label="样品机数" align="center" prop="QUALITY_SUM" v-if="columns[2].visible"/>
+      <el-table-column label="异常数" align="center" prop="QUALITY_SUM" v-if="columns[2].visible"/>
       <el-table-column label="产量" align="center" prop="OFF_LINE_NUM" v-if="columns[3].visible"/>
-      <el-table-column label="降级率" align="center" prop="REPAIR_RATE" v-if="columns[4].visible">
+      <el-table-column label="异常率" align="center" prop="REPAIR_RATE" v-if="columns[4].visible">
         <template slot-scope="scope">
           {{ parseFloat(scope.row.REPAIR_RATE) }}%
         </template>
@@ -90,8 +100,7 @@
 
 <script>
 import {
-  downgradeProportionReportList,
-  repairRateReportList
+  downgradeProportionReportList
 } from '@/api/report/reportAPI'
 import {findProductLineList} from '@//api/base/productLine'
 import {parseTime} from '@//utils/ruoyi'
@@ -132,6 +141,8 @@ export default {
       daterangeBeginTime: [],
       // 日期类型
       dateTypeList: [{ key: 10, label: '日' }, { key: 7, label: '月' }, { key: 4, label: '年' }],
+      // 异常类型
+      alarmTypeList: [{ key: 1, label: '降级品' }, { key: 2, label: '报废品' } ],
       // 查询参数
       queryParams: {
         // pageNum: 1,
@@ -140,6 +151,7 @@ export default {
         endBeginTime: null,
         stationCodeList: null,
         dateType: 10,
+        alarmType: 1,
         PRODUCT_LINE_CODE: 'CX_02',
         ORDER_CODE: null,
         MATERIAL_CODE: null,
@@ -153,9 +165,9 @@ export default {
       columns: [
         {key: 0, label: `主键标识`, visible: false},
         {key: 1, label: `日期`, visible: true},
-        {key: 2, label: `样品机数`, visible: true},
+        {key: 2, label: `异常数`, visible: true},
         {key: 3, label: `产量`, visible: true},
-        {key: 4, label: `降级率`, visible: true}
+        {key: 4, label: `异常率`, visible: true}
       ],
       // 产线选项
       productLineList: [],
@@ -222,7 +234,7 @@ export default {
           },
           legend: {
             itemWidth: 3 * vw,
-            data: ['样品机数', '降级率(%)', '目标(%)'],
+            data: ['异常数', '异常率(%)', '目标(%)'],
             textStyle: {
               color: "#000",
               margin: 15,
@@ -282,7 +294,7 @@ export default {
           ],
           series: [
             {
-              name: '样品机数',
+              name: '异常数',
               type: 'bar',
               itemStyle: {
                 normal: {
@@ -307,7 +319,7 @@ export default {
               },
             },
             {
-              name: '降级率(%)',
+              name: '异常率(%)',
               type: 'line',
               yAxisIndex: 1,
               data: e.map(val => parseFloat(val.REPAIR_RATE)),
@@ -376,7 +388,7 @@ export default {
     handleExport() {
       this.download('/report/qualityReport/downgradeProportionReportList/export', {
         ...this.queryParams
-      }, `降级率报表_${new Date().getTime()}.xlsx`)
+      }, `质量异常率报表_${new Date().getTime()}.xlsx`)
     },
 
   }
diff --git a/src/views/report/electricalInspection/index.vue b/src/views/report/electricalInspection/index.vue
index b8dc4d0..d508dfb 100644
--- a/src/views/report/electricalInspection/index.vue
+++ b/src/views/report/electricalInspection/index.vue
@@ -68,18 +68,18 @@
       <!--        >修改-->
       <!--        </el-button>-->
       <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['report:electricalInspection:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['report:electricalInspection:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"