From 7319d72dfd7aaf0ac0bac8c15b67719ee285b3b4 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Mon, 29 Apr 2024 13:48:03 +0800
Subject: [PATCH] bug

---
 src/views/Quality.vue   | 13 +++++++------
 src/views/ScrapList.vue |  7 +++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/Quality.vue b/src/views/Quality.vue
index 6adeb57..1ffe065 100644
--- a/src/views/Quality.vue
+++ b/src/views/Quality.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-01-09 13:48:42
- * @LastEditTime: 2024-04-22 09:33:28
+ * @LastEditTime: 2024-04-28 16:55:37
  * @LastEditors: DY
  * @Description:
 -->
@@ -55,8 +55,9 @@
         </van-row>
       </van-col>
     </van-row>
-    <el-scrollbar class="scollbar" ref="scrollbar" style="height: 100%" >
-      <el-backtop target=".scollbar .el-scrollbar__wrap" :visibility-height="10" :bottom="20">
+    <div style="height: 7px"></div>
+    <el-scrollbar class="scollbar" ref="scrollbar" style="height: 75%;" >
+      <el-backtop target=".scollbar .el-scrollbar__wrap" :visibility-height="10" :bottom="50">
         <i class="el-icon-caret-top" />
       </el-backtop>
       <div class="content" v-for="(item, index) in typeList" :key="index">
@@ -186,11 +187,11 @@ export default {
     getQuality () {
       // qualityManage().then(res => {
       qualityManage(this.listQuery).then(res => {
-        if (JSON.stringify(res.data.data) !== '{}') {
+        if (res.data.code === 0 && JSON.stringify(res.data.data) !== '{}') {
           this.typeList = Object.values(res.data.data)
           this.count = this.typeList[0][0].sunCount
           if (this.typeList[0][0]?.resetMethod === 1) {
-            this.resetMethod = true
+            this.showReset = true
           }
         } else {
           this.typeList = []
@@ -336,7 +337,7 @@ export default {
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   color: #000000;
-  margin-top: 7px;
+  margin-bottom: 7px;
   padding: 0 20px 20px 20px;
   box-sizing: border-box;
   /* overflow: scroll;
diff --git a/src/views/ScrapList.vue b/src/views/ScrapList.vue
index ab0f2d3..3bed871 100644
--- a/src/views/ScrapList.vue
+++ b/src/views/ScrapList.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-29 10:01:55
- * @LastEditTime: 2024-03-28 09:07:41
+ * @LastEditTime: 2024-04-28 16:41:33
  * @LastEditors: DY
  * @Description: 报废列表
 -->
@@ -27,7 +27,7 @@
     max-height="600"
     style="width: 100%">
       <el-table-column
-      type="index" label="序号" width="60" />
+      type="index" :index="indexMethod" label="序号" width="60" />
       <el-table-column v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" />
     </el-table>
     <el-pagination
@@ -96,6 +96,9 @@ export default {
     this.getList()
   },
   methods: {
+    indexMethod (index) {
+      return (this.listQuery.pageNo - 1) * 10 + index + 1
+    },
     handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
       this.listQuery.pageSize = val