diff --git a/src/components/account.vue b/src/components/account.vue index 9a086618..f50429b7 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -140,19 +140,19 @@ export default { this.seeEquipment = this.$store.state.userInfo.seeEquipment; this.loginData = JSON.parse(localStorage.getItem('systemInfo')) console.log(' this.loginData', this.loginData) - if( this.loginData.headerConfiguration != null){ + if( this.loginData.headerConfiguration != ""){ this.headerConfiguration = this.loginData.headerConfiguration } - if( this.loginData.projectBackground != null){ + if( this.loginData.projectBackground != ""){ this.projectBackground = this.loginData.projectBackground } - if( this.loginData.enterpriseBackground != null){ + if( this.loginData.enterpriseBackground != ""){ this.enterpriseBackground = this.loginData.enterpriseBackground } - if(this.loginData.equipmentChina !=null ){ + if(this.loginData.equipmentChina != "" ){ this.equipmentChina = this.loginData.equipmentChina } - if(this.loginData.dataCenter != null){ + if(this.loginData.dataCenter != ""){ this.dataCenter1 = this.loginData.dataCenter } // console.log('项目后台',this.projectBackground) diff --git a/src/components/selectWorker.vue b/src/components/selectWorker.vue index 84171971..6730f472 100644 --- a/src/components/selectWorker.vue +++ b/src/components/selectWorker.vue @@ -52,13 +52,15 @@ @selection-change="handleSelectionChange" :empty-text="'请选择条件进行查询'" > - + - + - + + + @@ -138,6 +140,7 @@ export default { getTableData() { getWorkerInfoList(this.searchForm).then((res) => { this.multipleSelection=[] + console.log('有籍贯吗',res.result.records) this.tableListData = res.result.records; }); }, diff --git a/src/views/projectFront/laborManage/EpidemicPrevention/index.vue b/src/views/projectFront/laborManage/EpidemicPrevention/index.vue index 55325628..1679ef55 100644 --- a/src/views/projectFront/laborManage/EpidemicPrevention/index.vue +++ b/src/views/projectFront/laborManage/EpidemicPrevention/index.vue @@ -2,7 +2,7 @@