From 714efbcf08c361891c7be16aa020aafaa66ed4c9 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 21 Apr 2022 18:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84/=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92=E3=80=81=E8=AE=BE?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/ImportFile/index.vue  |  2 +-
 .../components/ProjectDetails.vue             | 22 +++++++++-----
 .../components/listOfRelevantPersonnel.vue    |  2 +-
 .../components/settingList.vue                | 30 ++++++++++++++-----
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index fb7d3cd1d..b949dc0b7 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -37,7 +37,7 @@
     data() {
       return {
         tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
-        importUrl: window._CONFIG['domianURL'] + this.url.importZipUrl,
+        importUrl: window._CONFIG['domianURL'] +'/'+ this.url.importZipUrl,
         cut: '',
       }
     },
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index 421540153..acca2d371 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -100,7 +100,7 @@
       </div>
       <div class="process-content-right-xian"></div>
     </div>
-    <a-tabs default-active-key="1" class="ant-tabs">
+    <a-tabs style="margin-top: 20px" default-active-key="1" class="ant-tabs">
       <a-tab-pane key="1" :tab="$t('DeliverableStatus')">
         <div class="box-content">
           <div class="box-content-left">
@@ -149,8 +149,9 @@
           add: 'project/projectLibraryBase/add',
           edit: 'project/projectLibraryBase/edit',
           queryByProjectId: 'project/projectTaskPlanning/queryByProjectId',
-          addSettingUrl:'project/projectTaskPlanning/add',
-          editSettingUrl:'project/projectTaskPlanning/edit',
+          addSettingUrl: 'project/projectTaskPlanning/add',
+          editSettingUrl: 'project/projectTaskPlanning/edit',
+          settingQueryForm: '/project/projectTaskPlanning/list'
         },
         regulatoryCertificationTaskPlanList: []
       }
@@ -179,8 +180,8 @@
           }
         })
       },
-      settingListForm(){
-         this.getSetting()
+      settingListForm() {
+        this.getSetting()
       },
       mainEcharts() {
         var myChart = echarts.init(document.getElementById('main'))
@@ -273,7 +274,6 @@
 
   .process-content {
     margin-top: 4px;
-    height: 60px;
     position: relative;
 
     .process-content-content {
@@ -293,13 +293,14 @@
           font-size: 14px;
           font-weight: 400;
           color: #040B29;
-          max-width: 94px;
+          max-width: 155px;
           text-overflow: ellipsis;
           white-space: nowrap;
           overflow: hidden;
         }
 
         .process-content-right-button {
+          max-width: 155px;
           font-size: 12px;
           font-weight: 400;
           color: #6F7385;
@@ -318,7 +319,7 @@
     }
 
     .process-content-right-xian {
-      height: 1px;
+      height: 2px;
       width: calc(100% - 27px);
       background: #E6E6E9;
       position: absolute;
@@ -353,8 +354,13 @@
 
     .process-content-right-top {
       max-width: 70px !important;
+      white-space: inherit !important;
+      overflow: hidden !important;
     }
 
+    .process-content-right-button {
+      max-width: 70px !important;
+    }
   }
 
   .text-field-right-color {
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 2e3a46ebf..39cad2064 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -246,7 +246,7 @@
           list: '/project/projectRelatedPersonnel/list',
           edit: '/project/projectRelatedPersonnel/edit',
           exportData: '/project/projectRelatedPersonnel/exportXls',
-          importZipUrl:'project/projectRelatedPersonnel/importExcel',
+          importZipUrl:'/project/projectRelatedPersonnel/importExcel',
         },
         selectedRowKeys: []
       }
diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue
index 6584d4d82..619dee8e4 100644
--- a/jero-web/src/views/projectManagement/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/components/settingList.vue
@@ -135,7 +135,7 @@
 </template>
 
 <script>
-  import { getAction, postAction } from '@/api/manage'
+  import { getAction, postAction, putAction } from '@/api/manage'
   import moment from 'moment'
 
   export default {
@@ -153,19 +153,35 @@
     mounted() {
     },
     methods: {
-      edit(data) {
+      edit() {
         this.visible = true
-        this.$nextTick(() => {
-          this.ids = data || []
-          this.formInline = {}
+        this.settingQueryForm()
+      },
+      settingQueryForm() {
+        getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.$nextTick(() => {
+              this.formInline = res.result || {}
+            })
+          }
         })
       },
       handleOk() {
         let query = {
-          ...this.formInline
+          ...this.formInline,
+          projectId: this.$route.query.id
+        }
+        let url = ''
+        let Action
+        if (this.formInline.id) {
+          url = this.url.editSettingUrl
+          Action = putAction
+        } else {
+          url = this.url.addSettingUrl
+          Action = postAction
         }
         this.confirmLoading = true
-        postAction(this.url.editSettingUrl, query).then((res) => {
+        Action(url, query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
             this.visible = false