diff --git a/src/components/account.vue b/src/components/account.vue index eebcba3b..bfbccef5 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -139,11 +139,12 @@ export default { mounted() { this.seeEquipment = this.$store.state.userInfo.seeEquipment; this.loginData = JSON.parse(localStorage.getItem('systemInfo')) - this.headerConfiguration = this.loginData.headerConfiguration - this.projectBackground = this.loginData.projectBackground - this.enterpriseBackground = this.loginData.enterpriseBackground - this.dataCenter1 = this.loginData.dataCenter - this.equipmentChina = this.loginData.equipmentChina + console.log(' this.loginData', this.loginData) + this.headerConfiguration = this.loginData.headerConfiguration + this.projectBackground = this.loginData.projectBackground + this.enterpriseBackground = this.loginData.enterpriseBackground + this.dataCenter1 = this.loginData.dataCenter + this.equipmentChina = this.loginData.equipmentChina // console.log('项目后台',this.projectBackground) // console.log('企业后台',this.enterpriseBackground) }, diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue index 86b6cdf3..0fd7612e 100644 --- a/src/views/home/login_v1.vue +++ b/src/views/home/login_v1.vue @@ -304,6 +304,7 @@ export default { getDetail() { selectSystemLogoConfigApi().then((res) => { if (res.result) { + console.log('查看有没有背景图',res) console.log(window.location.protocol) this.systemInfo = res.result; if(this.systemInfo.loginLogo){ diff --git a/src/views/jxjadmin/registerAudit.vue b/src/views/jxjadmin/registerAudit.vue index 51232e29..42392a86 100644 --- a/src/views/jxjadmin/registerAudit.vue +++ b/src/views/jxjadmin/registerAudit.vue @@ -121,16 +121,25 @@ - - 是否启用精益建造 + + + + 选择系统版本 + + 标准版 + 星璇版 + 衢州版 - - 客服电话 - + + + + 客服电话 + diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue index 3e75cd3c..f75c0681 100644 --- a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue +++ b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue @@ -529,8 +529,11 @@ export default { methods: { //考勤打印 attendancePrint(){ + console.log('参数',this.formInline) this.printPdf = this.$http.defaults.baseURL + 'xmgl/workerWagesPayment/attendancePdf?monthTime=' + this.formInline.monthTime +'&personType=' + this.formInline.personType + '&projectSn=' + this.$store.state.projectSn + +'&enterpriseId='+this.formInline.enterpriseId + +'&teamId='+this.formInline.teamId // console.log('路径', this.printPdf ) }, // 导入考勤数据 diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 8ec9acb9..cfc2ef7f 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -344,7 +344,7 @@ type="primary" :disabled="checkedWorker.length == 0" @click="issuePersonFn" - v-if="!key" + v-if="key" >{{ $t("message.laborMange.aKeyIssued") }} @@ -494,11 +494,11 @@ type="primary" size="mini" @click="issuePersonOneFn(scope.row.id)" - v-if="!key" + v-if="key" >{{ $t("message.laborMange.aKeyIssued") }} - + {{ $t("message.laborMange.aKeyIssued") }} @@ -479,7 +479,7 @@ type="primary" size="mini" @click="issuePersonOneFn(scope.row.id)" - v-if="key" + v-if="!key" >{{ $t("message.laborMange.aKeyIssued") }} @@ -499,7 +499,7 @@ --> {{$t('message.deviceManage.refresh')}} + 导出