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 @@
- +
@@ -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 @@