From fa6ded8ed214faa857bb89d5e96f401f40274036 Mon Sep 17 00:00:00 2001
From: wuyize <wuyize25@163.com>
Date: Fri, 8 Jul 2022 16:10:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3run=20build=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=94=B9baseUrl=E5=88=B0ht?=
 =?UTF-8?q?tps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js          |  3 ++-
 src/views/OngoingProject.vue  |  8 +++++++-
 src/views/Project.vue         | 17 +++++++++++------
 src/views/ProjectGroup.vue    |  9 +++++----
 src/views/ProjectWorkitem.vue | 11 +++++++++--
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index cf984c4..27f17b6 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -1,4 +1,5 @@
 //const baseUrl = "http://192.168.31.194:8081/"
 //const baseUrl = "http://36.5.61.1:8081/"
-const baseUrl = "http://101.34.228.45:8080/api/"
+//const baseUrl = "http://101.34.228.45:8080/api/"
+const baseUrl = "https://www.hammer-hfut.tk/api/"
 export default baseUrl;
\ No newline at end of file
diff --git a/src/views/OngoingProject.vue b/src/views/OngoingProject.vue
index 1e2bdfb..9a7a788 100644
--- a/src/views/OngoingProject.vue
+++ b/src/views/OngoingProject.vue
@@ -30,7 +30,7 @@
         <el-table-column min-width="10%" align="right">
           <template #default="scope">
             <div style="height: 32px;">
-              <el-button v-show="this.$store.state.staff===null? false:(this.$store.state.staff.staffId===scope.row.projectCreator)" type="primary" plain
+              <el-button v-show="showCloseProjectButton(scope.row)" type="primary" plain
                          @click="onCloseProject(scope.row)">结项
               </el-button>
             </div>
@@ -98,6 +98,9 @@ export default {
 
       staffId: Number
     }
+  },
+  computed: {
+
   },
   created() {
     // watch 路由的参数，以便再次获取数据
@@ -119,6 +122,9 @@ export default {
   mounted() {
   },
   methods: {
+    showCloseProjectButton(row) {
+      return this.$store.state.staff===null? false:(this.$store.state.staff.staffId===row.projectCreator)
+    },
     onRowClick(row, column, event) {
       router.push({path: '/project/'+row.projectId})
     },
diff --git a/src/views/Project.vue b/src/views/Project.vue
index b78938a..5bc5215 100644
--- a/src/views/Project.vue
+++ b/src/views/Project.vue
@@ -32,13 +32,15 @@
                   display: flex; flex-direction: row; align-items: center;justify-content: space-between">
           <logout-button></logout-button>
           <span
-              style="font-family: 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266">{{ project.projectName }}</span>
+              style="font-family: 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266">{{
+              project.projectName
+            }}</span>
           <div style="margin: 0 30px 0 30px; ;
                   display: flex; flex-direction: row-reverse; align-items: center">
             <div style="width: 42px;height: 42px; background-color: #409EFF; border-radius: 21px;
                       display: flex; justify-content: center;align-items: center;">
               <span style="color: white">{{
-                  this.$store.state.staff === null ? this.$store.state.staff : this.$store.state.staff.staffFullname[0]
+                  getStaffFullname()[0]
                 }}</span>
             </div>
             <div style="height: 100%; margin-right: 10px;
@@ -46,7 +48,7 @@
             <span
                 style="color: #606266; font-family: 'Segoe UI',sans-serif;font-size: 14px;font-weight: bold; ">
               {{
-                this.$store.state.staff === null ? this.$store.state.staff : this.$store.state.staff.staffFullname
+                getStaffFullname()
               }}</span>
               <span style="color: #606266; font-family: 'Segoe UI',sans-serif;font-size: 12px;">{{
                   projectStaffPosition
@@ -102,12 +104,12 @@ export default {
     }
     const that = this
     request({
-      url: 'project/' + this.$route.params.projectId+'/group/'+this.$store.state.staff.staffId,
+      url: 'project/' + this.$route.params.projectId + '/group/' + this.$store.state.staff.staffId,
       method: 'get',
     }).then(response => {
       if (response.data.code === 200) {
         that.projectStaffPosition = response.data.data.projectStaffPosition
-        that.projectAccessLevel =  response.data.data.projectAccessLevel
+        that.projectAccessLevel = response.data.data.projectAccessLevel
       }
     }).catch(function (error) {
       console.log(error)
@@ -116,6 +118,9 @@ export default {
     this.getProjectGroup()
   },
   methods: {
+    getStaffFullname() {
+      return this.$store.state.staff === null ? ' ' : this.$store.state.staff.staffFullname
+    },
     getProjectInfo() {
       const that = this
       request({
@@ -133,7 +138,7 @@ export default {
     getProjectGroup() {
       const that = this
       request({
-        url: 'project/' + this.$route.params.projectId+'/group',
+        url: 'project/' + this.$route.params.projectId + '/group',
         method: 'get'
 
       }).then(response => {
diff --git a/src/views/ProjectGroup.vue b/src/views/ProjectGroup.vue
index e035622..eee7a51 100644
--- a/src/views/ProjectGroup.vue
+++ b/src/views/ProjectGroup.vue
@@ -1,14 +1,15 @@
 <template>
-  <view style="display: flex;height: 100%;justify-content: space-around;">
+  <view style="display: flex;margin: 0 30px 10px 30px;height: 100%;justify-content: space-around;">
 
-    <div class="left" ref="leftRef" style="width: 50%;height: 100%;">
+    <div class="left" ref="leftRef" style="width: 50%;height: 100%;padding: 0 30px 0 0">
       <div style="margin: 0 0 26px 0;display: flex;flex-direction: row;justify-content: space-between" ref="left_title_Ref">
         <p style="text-align:center; 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266">项目团队</p>
         <el-button style="" type="primary" >新增成员</el-button>
       </div>
+
       <el-table
           ref="tableRef"
-          class="projectTable"
+          style="width: 100%"
           :height="tableHeight"
           :data="tableData">
         <el-table-column prop="staffFullname" label="姓名" min-width="25%"> </el-table-column>
@@ -59,7 +60,7 @@
       </div>
 
     </div>
-    <div class="right" style="width: 45%;display: flex;flex-direction: column;height: 100%;">
+    <div class="right" style="width: 50%;display: flex;flex-direction: column;height: 100%;">
       <div style="display: flex;flex-direction: column;height: 100%">
         <p style="'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266;margin: 0 0 30px 0;flex-shrink: 0;">岗位统计</p>
         <div style="flex: 1;height: 100%">
diff --git a/src/views/ProjectWorkitem.vue b/src/views/ProjectWorkitem.vue
index 35c96a9..6ca9aac 100644
--- a/src/views/ProjectWorkitem.vue
+++ b/src/views/ProjectWorkitem.vue
@@ -488,9 +488,16 @@ export default {
         else
           Promise.reject(response)
       }).catch(function (error) {
-        console.log(error)
+        console.log(error.data)
+        let msg = '修改失败，'
+        if(error.data&&error.data.msg)
+        {
+          msg+=error.data.msg
+        }
+        else
+          msg+='未知错误'
         ElMessage({
-          message: '修改失败',
+          message: msg,
           type: 'error',
         })
         if (submitForm.taskFatherId === 0) {