From f4a6ac460569df501e3a0cdf95b383bc34a8ff11 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 10 Jul 2023 13:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=AE=BE=E7=BD=AE=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E4=B8=8D=E5=88=86=E9=A1=B5=E5=B1=95=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervisionNew/mytask.vue | 39 +++++++++++-----------
 client/src/views/supervisionNew/taskdo.vue | 26 +++++++--------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index 5ea64b9..00268c6 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -251,7 +251,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  :height="tableHeight"
+                  max-height="300"
                 >
                 <el-table-column label="序号" type="index" width="50" />
                 <el-table-column label="检查类型">
@@ -286,7 +286,6 @@
                   fit
                   stripe
                   highlight-current-row
-                  :height="tableHeight"
                   id="oinspect"
                   style="display: none;"
                 >
@@ -326,7 +325,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  :height="tableHeight"
+                  max-height="300"
                 >
                 <el-table-column label="序号" type="index" width="50" />
                 <el-table-column label="报告/证书编号" prop="number"></el-table-column>
@@ -386,7 +385,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  :height="tableHeight"
+                  max-height="300"
                 >
                 <el-table-column label="序号" type="index" width="50" />
                 <el-table-column label="超期报告/证书编号" prop="number"></el-table-column>
@@ -453,7 +452,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  :height="tableHeight"
+                  max-height="300"
                 >
                 <el-table-column label="序号" type="index" width="50" />
                 <el-table-column label="能力验证名称" prop="name"></el-table-column>
@@ -540,7 +539,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  :height="tableHeight"
+                  max-height="300"
                 >
                 <el-table-column label="序号" type="index" width="50" />
                 <el-table-column label="投诉人/机构" prop="complainant"></el-table-column>
@@ -619,7 +618,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  :height="tableHeight"
+                  max-height="300"
                 >
                 <el-table-column label="序号" type="index" width="50" />
                 <el-table-column label="风险事实描述" prop="content"></el-table-column>
@@ -841,7 +840,7 @@
       },
       mounted(){
         let height1 = document.getElementsByClassName('app-main')[0].clientHeight;
-        this.leftHeight = height1-15;
+        this.leftHeight = height1-25;
         this.listQuery.belong_dept =this.$store.getters.dept;
         this.getOrgList();
         this.getList();
@@ -989,46 +988,46 @@
         },
         getRcList(){
           let that = this;
-          getRcList({task2do:that.task2do,etype:10}).then((res) => {
+          getRcList({task2do:that.task2do,etype:10,page:0}).then((res) => {
             if (res.code >= 200) {
-              that.rcList =res.data.results;
+              that.rcList =res.data;
             }
           });
-          getRcList({task2do:that.task2do,etype:20}).then((res) => {
+          getRcList({task2do:that.task2do,etype:20,page:0}).then((res) => {
             if (res.code >= 200) {
-              that.rc2List =res.data.results;
+              that.rc2List =res.data;
             }
           });
         },
         getPtList(){
           let that = this;
-          getPtList({task2do:that.task2do}).then((res) => {
+          getPtList({task2do:that.task2do,page:0}).then((res) => {
             if (res.code >= 200) {
-              that.ptList=res.data.results;
+              that.ptList=res.data;
             }
           });
         },
         getRiskList(){
           let that = this;
-          getRiskList({task2do:that.task2do}).then((res) => {
+          getRiskList({task2do:that.task2do,page:0}).then((res) => {
             if (res.code >= 200) {
-              that.riskList = res.data.results;
+              that.riskList = res.data;
             }
           });
         },
         getComplaintList(){
           let that = this;
-          getComplaintList({task2do:that.task2do}).then((res) => {
+          getComplaintList({task2do:that.task2do,page:0}).then((res) => {
             if (res.code >= 200) {
-              that.complaintList = res.data.results;
+              that.complaintList = res.data;
             }
           });
         },
         getOinspectList(){
           let that = this;
-          getOinspectList({task2do:that.task2do}).then((res) => {
+          getOinspectList({task2do:that.task2do,page:0}).then((res) => {
             if (res.code >= 200) {
-              that.oinspectList=res.data.results;
+              that.oinspectList=res.data;
             }
           });
         },
diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue
index 75955ee..09eb9ad 100644
--- a/client/src/views/supervisionNew/taskdo.vue
+++ b/client/src/views/supervisionNew/taskdo.vue
@@ -641,48 +641,46 @@ export default {
     },
     getRcList(){
       let that = this;
-      getRcList({task2do:that.task2do,etype:10}).then((res) => {
+      getRcList({task2do:that.task2do,etype:10,page:0}).then((res) => {
         if (res.code >= 200) {
-          that.rcList =res.data.results;
+          that.rcList =res.data;
         }
       });
-      getRcList({task2do:that.task2do,etype:20}).then((res) => {
+      getRcList({task2do:that.task2do,etype:20,page:0}).then((res) => {
         if (res.code >= 200) {
-          that.rc2List =res.data.results;
+          that.rc2List =res.data;
         }
       });
     },
     getPtList(){
       let that = this;
-      getPtList({task2do:that.task2do}).then((res) => {
+      getPtList({task2do:that.task2do,page:0}).then((res) => {
         if (res.code >= 200) {
-          that.ptList=res.data.results;
+          that.ptList=res.data;
         }
       });
     },
     getRiskList(){
       let that = this;
-      getRiskList({task2do:that.task2do}).then((res) => {
+      getRiskList({task2do:that.task2do,page:0}).then((res) => {
         if (res.code >= 200) {
-          // debugger;
-          console.log(res)
-          that.riskList = res.data.results;
+          that.riskList = res.data;
         }
       });
     },
     getComplaintList(){
       let that = this;
-      getComplaintList({task2do:that.task2do}).then((res) => {
+      getComplaintList({task2do:that.task2do,page:0}).then((res) => {
         if (res.code >= 200) {
-          that.complaintList = res.data.results;
+          that.complaintList = res.data;
         }
       });
     },
     getOinspectList(){
       let that = this;
-      getOinspectList({task2do:that.task2do}).then((res) => {
+      getOinspectList({task2do:that.task2do,page:0}).then((res) => {
         if (res.code >= 200) {
-          that.oinspectList=res.data.results;
+          that.oinspectList=res.data;
         }
       });
     },