diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index 6dff278bb..fb7d3cd1d 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -4,8 +4,8 @@
class="upload-text"
:multiple="false" :headers="tokenHeader"
:action="importUrl+'?cut='+cut"
- @change="handleImportZip"
- accept=".zip">
+ @change="handleImport"
+ :accept="accept">
{{$t('import')}}
@@ -28,7 +28,11 @@
isTrue:{
type: Boolean,
default: false
- }
+ },
+ accept:{
+ type: String,
+ default: ''
+ },
},
data() {
return {
@@ -47,7 +51,7 @@
}
},
methods: {
- handleImportZip(info) {
+ handleImport(info) {
this.spinning = true
if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList)
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index 5bda5e60b..c6e4c4b0d 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -25,7 +25,7 @@
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 986ad9608..399543c6b 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -88,7 +88,7 @@
{{$t('DocumentStandard')}}
@@ -304,7 +304,7 @@
title: this.$t('correspondingStandard'),
align: 'center',
ellipsis: true,
- dataIndex: 'correspondingStandard_dictText'
+ dataIndex: 'correspondingStandardName'
},
{
title: this.$t('zoneOfApplication'),
@@ -622,6 +622,9 @@
}
})
},
+ getPersonnelList(){
+ this.getList()
+ },
batSettingList() {
this.getList()
},
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index 9e7013fde..421540153 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -123,7 +123,7 @@
-
+
@@ -148,7 +148,9 @@
queryById: 'project/projectLibraryBase/queryById',
add: 'project/projectLibraryBase/add',
edit: 'project/projectLibraryBase/edit',
- queryByProjectId: 'project/projectTaskPlanning/queryByProjectId'
+ queryByProjectId: 'project/projectTaskPlanning/queryByProjectId',
+ addSettingUrl:'project/projectTaskPlanning/add',
+ editSettingUrl:'project/projectTaskPlanning/edit',
},
regulatoryCertificationTaskPlanList: []
}
@@ -177,6 +179,9 @@
}
})
},
+ settingListForm(){
+ this.getSetting()
+ },
mainEcharts() {
var myChart = echarts.init(document.getElementById('main'))
myChart.setOption({
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 57b5574e0..3c61dbeb6 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -29,7 +29,7 @@
{{$t('templateDownload')}}
@@ -145,6 +145,9 @@
},
handleDel(){
+ },
+ getPersonnelList(){
+
},
},
}
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 01754cf33..e363f6ae0 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -65,7 +65,7 @@
-
+
@@ -701,6 +701,9 @@ export default {
}
})
},
+ getPersonnelList(){
+ this.getList()
+ },
initiateListConfirmationcClick() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 3d7e39d46..2e3a46ebf 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -18,7 +18,7 @@
{{$t('export')}}
-
+