Merge remote-tracking branch 'origin/master'

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();

src/pages/information/contentManage/contentList.vue

@@ -96,14 +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(res.articleList[0])
-                }
-                
-                console.log(res)
-
-
                 if (!this.listData.length && this.totals) {
                     this.pageNo--;
                     this.getData();
@@ -216,9 +208,4 @@ export default {
 .off + span {
     display: none;
 }
-
-.page-content {
-    height: 67vh;
-    overflow: auto!important;
-}
 </style>

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;

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;