admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-xiaole' into 'master'

Browse Source 
添加衢州版

See merge request !34
This commit is contained in:
杜海鹏 2022-07-06 18:28:09 +08:00
commit ffb0b1c3a2
7 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/account.vue
View File

@ -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)
},

1
src/views/home/login_v1.vue
View File

@ -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){

19
src/views/jxjadmin/registerAudit.vue
View File

@ -121,16 +121,25 @@
</el-col>
</el-row>
<el-row :gutter="24" style="margin-top: 20px">
<el-col :span="11" style="margin:7px 0px 0 0;">
<span class="firstConlumLabel">是否启用精益建造</span>
<el-col :span="16" style="margin:7px 0px 0 0;">
<!-- 此处注释是因为添加了一个菜单版本 20220706 -->
<!-- <span class="firstConlumLabel">是否启用精益建造</span>
<el-radio-group v-model="styleType" size="medium" @change="getBaseModuleList">
<el-radio :label="2">是</el-radio>
<el-radio :label="1">否</el-radio>
</el-radio-group> -->
<span class="firstConlumLabel">选择系统版本</span>
<el-radio-group v-model="styleType" size="medium" @change="getBaseModuleList">
<el-radio :label="1">标准版</el-radio>
<el-radio :label="2">星璇版</el-radio>
<el-radio :label="3">衢州版</el-radio>
</el-radio-group>
</el-col>
<el-col :span="13" style="text-align:right">
<span>客服电话</span>
<el-input v-model="customerServicePhone" size="medium" placeholder="请输入" style="display: inline-block; width: 220px; margin-left: 15px;"></el-input>
</el-row>
<el-row :gutter="24" style="margin-top: 20px">
<el-col :span="16" style="margin:7px 0px 0 0;">
<span class="firstConlumLabel">客服电话</span>
<el-input v-model="customerServicePhone" size="medium" placeholder="请输入" style="display: inline-block; width: 200px;"></el-input>
</el-col>
</el-row>
<el-row :gutter="24" style="margin-top: 20px">

3
src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
View File

@ -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 )
},
// 导入考勤数据

6
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -344,7 +344,7 @@
type="primary"
:disabled="checkedWorker.length == 0"
@click="issuePersonFn"
v-if="!key"
v-if="key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</el-form-item>
@ -494,11 +494,11 @@
type="primary"
size="mini"
@click="issuePersonOneFn(scope.row.id)"
v-if="!key"
v-if="key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</div>
<div v-if="!key">
<div v-if="key">
<el-checkbox
v-model="scope.row.isUploadHousing"
:checked="scope.row.isUploadHousing == 1 ? true : false"

6
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -336,7 +336,7 @@
type="primary"
:disabled="checkedWorker.length == 0"
@click="issuePersonFn"
v-if="key"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</el-form-item>
@ -479,7 +479,7 @@
type="primary"
size="mini"
@click="issuePersonOneFn(scope.row.id)"
v-if="key"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</div>
@ -499,7 +499,7 @@
</div> -->
<div
class="personItemBottom"
v-if="key"
v-if="!key"
>
<el-checkbox
v-model="scope.row.isUploadHousing"

1
src/views/projectFront/safetyEducation/trainingRecords.vue
View File

@ -55,6 +55,7 @@
$t("message.deviceManage.query")
}}</el-button>
<el-button type="warning" size="medium" plain @click="refresh">{{$t('message.deviceManage.refresh')}}</el-button>
<!-- 目前广西联通需要安全教育导出功能 20220706-->
<el-button type="primary" size="medium" plain @click="exportBtn">
<a :href="printUrl" class="printUrl">导出</a>
</el-button>