From b34a27d7c49aa1a1d694cf3cf6f3062c46e61c3a Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 31 Dec 2021 10:31:48 +0800
Subject: [PATCH 1/3] css_bug

---
 src/pages/information/contentManage/contentList.vue | 12 ++----------
 src/pages/information/contentManage/index.vue       |  3 ++-
 src/pages/information/list/index.vue                |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/pages/information/contentManage/contentList.vue b/src/pages/information/contentManage/contentList.vue
index e57a9a9..62d8041 100644
--- a/src/pages/information/contentManage/contentList.vue
+++ b/src/pages/information/contentManage/contentList.vue
@@ -96,13 +96,10 @@ export default {
             this.$get(`${this.api.queryArticleByCondition}/${this.pageNo}/${this.pageSize}`, data).then(res => {
                 this.listData = res.articleList;
                 this.totals = res.total;
-                // 测试中。。。以下可删
+
                 for(let i=0; i<9; i++) {
-                    this.listData.push(res.articleList[0])
+                    this.listData.push(this.listData[0])
                 }
-                
-                console.log(res)
-
 
                 if (!this.listData.length && this.totals) {
                     this.pageNo--;
@@ -216,9 +213,4 @@ export default {
 .off + span {
     display: none;
 }
-
-.page-content {
-    height: 67vh;
-    overflow: auto!important;
-}
 </style>
\ No newline at end of file
diff --git a/src/pages/information/contentManage/index.vue b/src/pages/information/contentManage/index.vue
index 4031e8a..80cef3d 100644
--- a/src/pages/information/contentManage/index.vue
+++ b/src/pages/information/contentManage/index.vue
@@ -85,10 +85,11 @@ export default {
 
 <style lang="scss" scoped>
 .menu-con {
+    // 改的
     height: calc(100vh - 250px);
     border-right: solid 1px #e6e6e6;
     background-color: #F2F6FC;
-    overflow: hidden;
+    // overflow: hidden;
 
     .el-menu {
         background-color: transparent;
diff --git a/src/pages/information/list/index.vue b/src/pages/information/list/index.vue
index 4ef7fc0..7135894 100644
--- a/src/pages/information/list/index.vue
+++ b/src/pages/information/list/index.vue
@@ -45,7 +45,7 @@ export default {
 
 <style lang="scss" scoped>
 .page .el-tabs--left {
-    height: calc(100vh - 250px);
+    // height: calc(100vh - 250px);
 
     /deep/ .el-tabs__item {
         height: 60px;

From c8ea99e47a17b03786037a6c4147b6c801cfe264 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 31 Dec 2021 11:16:15 +0800
Subject: [PATCH 2/3] update

---
 src/pages/information/contentManage/contentList.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/information/contentManage/contentList.vue b/src/pages/information/contentManage/contentList.vue
index 62d8041..be3f220 100644
--- a/src/pages/information/contentManage/contentList.vue
+++ b/src/pages/information/contentManage/contentList.vue
@@ -96,11 +96,6 @@ export default {
             this.$get(`${this.api.queryArticleByCondition}/${this.pageNo}/${this.pageSize}`, data).then(res => {
                 this.listData = res.articleList;
                 this.totals = res.total;
-
-                for(let i=0; i<9; i++) {
-                    this.listData.push(this.listData[0])
-                }
-
                 if (!this.listData.length && this.totals) {
                     this.pageNo--;
                     this.getData();

From cdcc4d1afdcac552400acbe085da29fd477e6c53 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 31 Dec 2021 16:51:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8A=A5=E5=91=8Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/teach/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue
index b78f8d1..6b45802 100644
--- a/src/pages/achievement/teach/index.vue
+++ b/src/pages/achievement/teach/index.vue
@@ -177,10 +177,11 @@ export default {
             }
         },
         handleDelete(row) { // 删除
+        console.log(row)
             this.$confirm("确定要删除吗？", "提示", {
                 type: "warning"
             }).then(() => {
-                this.$post(this.api.deleteExperimentalReport, [row.projectId]).then(res => {
+                this.$post(this.api.deleteExperimentalReport, [row.reportId]).then(res => {
                     util.successMsg("删除成功");
                     this.getData();
                 }).catch(res => {
@@ -194,8 +195,9 @@ export default {
                     type: "warning"
                 }).then(() => {
                     let ids = this.multipleSelection.map(item => {
-                        return item.projectId;
+                        return item.reportId;
                     });
+                    console.log(ids)
                     this.$post(this.api.deleteExperimentalReport, ids).then(res => {
                         this.multipleSelection = [];
                         this.$refs.table.clearSelection();