From c68ea761322733185e31b2f49a31010c822c8a9b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 21 Oct 2021 20:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/list/index.vue | 19 ++-----------------
 src/pages/project/add/index.vue      |  6 +++++-
 src/setting.js                       |  4 ++--
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue
index 9badad5..d3eb515 100644
--- a/src/pages/achievement/list/index.vue
+++ b/src/pages/achievement/list/index.vue
@@ -234,13 +234,7 @@ export default {
             this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
                 type: "warning"
             }).then(() => {
-                let url = "";
-                if (this.projectPermissions === 0) {
-                    url = `${this.api.deleteExperimentalReport}?projectIds=${row.projectId}&projectPermissions=${this.projectPermissions}`;
-                } else {
-                    url = `${this.api.deleteExperimentalReport}?ids=${row.assessmentId}&projectIds=${row.projectId}&projectPermissions=${this.projectPermissions}`;
-                }
-                this.$post(url).then(res => {
+                this.$post(`${this.api.deleteReportById}?ids=${row.assessmentId}&projectIds=${row.projectId}&projectPermissions=${this.projectPermissions}`).then(res => {
                     util.successMsg("删除成功");
                     this.getData();
                 }).catch(res => {
@@ -253,20 +247,11 @@ export default {
                 this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
                     type: "warning"
                 }).then(() => {
-                    let url = "";
                     let ids = [];
                     let projectIds = this.multipleSelection.map(item => {
                         return item.projectId;
                     });
-                    if (this.projectPermissions === 0) {
-                        url = `${this.api.deleteExperimentalReport}?projectIds=${projectIds.toString()}&projectPermissions=${this.projectPermissions}`;
-                    } else {
-                        ids = this.multipleSelection.map(item => {
-                            return item.assessmentId;
-                        });
-                        url = `${this.api.deleteExperimentalReport}?ids=${ids.toString()}&projectIds=${projectIds.toString()}&projectPermissions=${this.projectPermissions}`;
-                    }
-                    this.$post(url).then(res => {
+                    this.$post(`${this.api.deleteReportById}?ids=${ids.toString()}&projectIds=${projectIds.toString()}&projectPermissions=${this.projectPermissions}`).then(res => {
                         this.multipleSelection = [];
                         this.$refs.table.clearSelection();
                         util.successMsg("删除成功");
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index c7496a4..80371f4 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div ref="main" class="main">
         <el-form :disabled="isDetail">
             <el-card shadow="hover" class="m-b-20">
                 <div class="flex-between">
@@ -764,4 +764,8 @@ export default {
     padding: 0;
     border-bottom: 0;
 }
+.main{
+    overflow: auto;
+    height: calc(100vh - 152px );
+}
 </style>
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index a0aa5cb..d47d0f5 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -41,8 +41,8 @@ if (isHh) {
     schoolId = 2105;
 } else if (isDev) {
     jumpPath = "http://192.168.31.154:8087/";
-    // host = "http://39.108.250.202:9000/"; // 中台测试服
-    host = "http://192.168.31.151:9000/"; // 榕
+    host = "http://39.108.250.202:9000/"; // 中台测试服
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.125:9000/"; // 坤
     // host = 'http://192.168.31.137:9000/'; // 赓
     title = "职站服务端管理系统";