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

Merge branch 'master' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi

Browse Source
This commit is contained in:
Luck-Xiaomi 2022-07-06 13:58:48 +08:00
commit 461a82ad2d
11 changed files with 143 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/api/laborPerson.js
View File

@ -129,7 +129,7 @@ export const safeEducationQuestionListApi = data => post('xmgl/safeEducationQues
export const safeEducationQuestionAddApi = data => post('xmgl/safeEducationQuestion/addQuestionCourse', data);
export const safeEducationQuestionDetailApi = data => post('xmgl/safeEducationQuestion/selectSafeEducationQuestionInfo', data);
export const selectWorkerEducationPageApi = data => post('xmgl/safeEducationQuestion/selectWorkerEducationPage', data);
export const exportExcelWorkerEducationApi = data => post('xmgl/safeEducationQuestion/exportExcelWorkerEducation', data);
export const selectCompanyEducationCoursePageApi = data => post('xmgl/safeEducationQuestion/selectCompanyEducationCoursePage', data);
//安全教育 --- 课程分类

1
src/views/companyFront/peopleManage/peopleManage.vue
View File

@ -762,6 +762,7 @@ export default {
sn: sn,
projectName: this.formInline.projectName,
}).then((res) => {
console.log('培训人数',res)
if (res.result) {
this.statictisData = res.result;
console.log(this.statictisData, '列表数据')

5
src/views/jxjadmin/moduleMenuManage.vue
View File

@ -636,7 +636,7 @@ export default {
btnList:[],
moudleTypeArr:['企业模块','项目后台','企业后台','项目看板'],
searchModuleType: 2,
styleTypeArr:['普通项目级版本','精益建造版本'],
styleTypeArr:['普通项目级版本','精益建造版本','衢州版'],
searchStyleType:1,
allMenuList:[]
};
@ -794,9 +794,12 @@ export default {
if (valid) {
let params = this.addEditForm;
params.styleType=this.searchStyleType
console.log("params", params);
console.log("添加信息", this.addEditForm);
if (this.Popup.type === "add") {
console.log('添加成功的参数',params)
addModuleApi(params).then((result) => {
console.log('添加成功的返回值',result)
if (result.success) {
this.$message.success(result.message);
this.getList();

95
src/views/messageV2.vue
View File

@ -38,7 +38,7 @@
value="">
</el-option>
<el-option
v-for="item in $t('message.messageCenter.options')"
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
@ -130,54 +130,61 @@ export default {
pageSize: 20,
tableData: [],
options:[{
label: "高空火警",
value: "8"
},{
label: "考勤提醒",
value: "1"
},{
label: "防疫人员通知",
value: "2"
},{
label: "防疫车辆通知",
value: "3"
},{
label: "访客通知",
value: "16"
},{
label: "混凝土监测",
value: "4"
},{
label: "卸料平台",
value: "5"
},{
label: "配电箱",
value: "6"
},{
label: "扬尘",
value: "7"
},{
label: "标养室",
value: "9"
},{
label: "安全检查",
value: "10"
},{
label: "质量检查",
value: "11"
},{
label: "塔吊",
value: "12"
},{
label: "升降机",
value: "13"
},{
label: "电表",
value: "14"
},{
label: "水表",
value: "15"
}],
// options:[{
// label: "高空火警",
// value: "8"
// },{
// label: "考勤提醒",
// value: "1"
// },{
// label: "防疫人员通知",
// value: "2"
// },{
// label: "防疫车辆通知",
// value: "3"
// },{
// label: "访客通知",
// value: "16"
// },{
// label: "混凝土监测",
// value: "4"
// },{
// label: "卸料平台",
// value: "5"
// },{
// label: "配电箱",
// value: "6"
// },{
// label: "扬尘",
// value: "7"
// },{
// label: "标养室",
// value: "9"
// },{
// label: "安全检查",
// value: "10"
// },{
// label: "质量检查",
// value: "11"
// },{
// label: "塔吊",
// value: "12"
// },{
// label: "升降机",
// value: "13"
// },{
// label: "电表",
// value: "14"
// },{
// label: "水表",
// value: "15"
// }],
};
},
created() {
@ -281,7 +288,7 @@ export default {
border-radius: 3px;
display: flex;
align-items: center;
height: 100px;
height: 200px;
padding: 0 20px;
margin-bottom: 20px;
position: relative;

1
src/views/projectAdmin/projectIndex.vue
View File

@ -116,7 +116,6 @@ import {
import {
getDockingUrlApi
} from "@/assets/js/api/configManage";
import Axios from "axios";
export default {
name: "projectIndex",
components: { vhead },

44
src/views/projectFront/configManage/roleManage.vue
View File

@ -172,14 +172,19 @@
<div class="dialog_content">
<!-- default-expand-all -->
<!-- <div>项目模块</div> -->
<div>
<el-checkbox v-model="checkAll" @change="selectAll"></el-checkbox>全选
</div>
<!-- <div>
<el-checkbox
v-model="checkAll"
@change="selectAll">全选</el-checkbox>
</div> -->
<!-- :props="props" -->
<el-tree ref="tree"
v-bind="myTree"
node-key="authorityId"
:props="props"
:data="projectMenus"
show-checkbox
:default-expand-all="isExpand"
:filter-node-method="filterNode"
@check-change="handleCheckChange"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
@ -236,7 +241,15 @@ export default {
},
data() {
return {
checkAll:false, //是否全选
myTree:{
data:[],
props: {
label: "name",
children: "menuList",
},
treeAllChildNode: [], // 数所有的可选择的子节点
checkAll:false, //是否全选
},
addEditForm: {
roleName: "",
roleDesc: "",
@ -271,10 +284,6 @@ export default {
// total: 0, //总条数
// },
// count: 0,
props: {
label: "name",
children: "menuList",
},
projectMenus:[],
selectRoleMenus:[],
allOperateList:[],
@ -498,14 +507,15 @@ export default {
// console.log('选择',this.$refs.tree.getCheckedKeys());
},
// 全选反选
selectAll(){
// if(this.checkAll){
// // console.log('111111',this.$refs)
// this.$refs.tree.setCheckedNodes(this.projectMenus);
// }else{
// this.$refs.tree.setCheckedKeys([])
// }
},
// selectAll(){
// if(this.checkAll){
// // for(let i = 0;)
// console.log('111111',this.$refs)
// this.$refs.tree.setCheckedNodes(this.projectMenus);
// }else{
// this.$refs.tree.setCheckedKeys([])
// }
// },
},
};
</script>

2
src/views/projectFront/epidemicPrevention/visitorsManage.vue
View File

@ -496,7 +496,7 @@ export default {
pageSize: this.pageSize,
visitName: this.visitName,
// enterDate:this.enterDate,
// userEnterpriseId: this.$store.state.userInfo.userEnterpriseId,
userId: this.$store.state.userInfo.userId,
codeState:this.codeState
};
visitorManageRecordApi(data).then((res) => {

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

@ -260,7 +260,7 @@
<el-form-item :label="$t('message.laborMange.workingState')">
<el-select
v-model="tableParameter.inserviceType"
style="width: 120px"
style="width: 100px"
>
<el-option
:label="$t('message.laborMange.all')"
@ -282,7 +282,7 @@
>
<el-select
v-model="tableParameter.codeState"
style="width: 120px"
style="width: 80px"
>
<el-option
:label="$t('message.laborMange.all')"
@ -308,14 +308,14 @@
</el-form-item>
<el-form-item :label="$t('message.laborMange.compellation')">
<el-input
style="width: 120px"
style="width: 100px"
v-model="tableParameter.workerName"
:placeholder="$t('message.laborMange.placeholder2')"
></el-input>
</el-form-item>
<el-form-item :label="$t('message.laborMange.IdNumber')">
<el-input
style="width: 120px"
style="width: 80px"
v-model="tableParameter.idCard"
:placeholder="$t('message.laborMange.placeholder2')"
></el-input>
@ -452,7 +452,7 @@
<img src="@/assets/images/icon-edit.png" style="margin-right:5px" />
<span>{{$t('message.laborMange.edit')}}</span>
</div> -->
<!-- 再次进场 -->
<el-button
class="operationText"
type="text"
@ -1684,6 +1684,7 @@
</template>
<script>
import axios from 'axios'
import {
deleteTeamInfo,
editTeamInfo,
@ -1870,10 +1871,12 @@ export default {
data.menuList.forEach((item)=>{
if(item.actionList){
item.actionList.forEach((item2)=>{
if(item2.actionCode = 'akey_issued' ){
this.key = true ;
// console.log('key',this.key)
if(item2.actionCode == 'akey_issued'){
this.key = false
} else {
this.key = true
}
console.log('this.key',this.key)
})
}
})
@ -2409,7 +2412,7 @@ export default {
// })
// },
// 新增 || 编辑 人员录入 保存按钮
// 新增 || 编辑 人员录入 保存按钮
savePersonFn(formName) {
console.log("企业id", this.checkedId);
if (!IdentityCodeValid(this.personForm.idCard)) {
@ -2482,6 +2485,7 @@ export default {
//编辑
} else {
let data = this.personForm;
console.log('dadadaa',data)
if (this.personForm.ufaceDevId.length > 0) {
data.ufaceDevId = this.personForm.ufaceDevId.join(",");
} else {
@ -2512,8 +2516,7 @@ export default {
return false;
}
});
},
},
//编辑 人员信息
editWorkerInfo(value, type) {
this.personDialogTitle = this.$t(
@ -2552,6 +2555,7 @@ export default {
personSerial: "",
};
this.getUfaceDevList();
this.goTwo();
this.addPersonDialog = true;
this.personForm = JSON.parse(JSON.stringify(value));
this.personForm.sex = Number(value.sex);
@ -3384,6 +3388,7 @@ export default {
isUploadHousing: value ? 1 : 0,
id: id,
};
console.log('data',json)
updateByIdWorkerInfo(json).then((res) => {
// if (res.code == 200) {
// this.$message.success(this.$t("message.laborMange.modifySuccess"));

31
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>
@ -428,6 +428,7 @@
<el-table-column prop="address" width="270px">
<template slot-scope="scope">
<div class="tableBtns">
<!-- 退场 -->
<el-button
size="medium"
type="text"
@ -448,6 +449,7 @@
/>
<span>{{ $t("message.laborMange.edit") }}</span>
</div> -->
<!-- 再次进场 -->
<el-button
size="medium"
type="text"
@ -477,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>
@ -497,7 +499,7 @@
</div> -->
<div
class="personItemBottom"
v-if="!key"
v-if="key"
>
<el-checkbox
v-model="scope.row.isUploadHousing"
@ -1892,6 +1894,7 @@
size="medium"
>{{ $t("message.laborMange.cancel") }}</el-button
>
<!-- 确定按钮 -->
<el-button
type="primary"
icon="el-icon-circle-check"
@ -2260,6 +2263,7 @@ import {
updateByIdWorkerInfo,
sendBatchWokerApi
} from "@/assets/js/api/laborPerson";
import axios from 'axios'
import {
selectUserDevAuthorityByUserIdApi,
exporExcelWorkerTemplateApi,
@ -2377,6 +2381,7 @@ export default {
enterDate: "",
nation: "",
nativePlace: "",
isUploadHousing:'',
issuingAuthorityForIdcard: "",
idCardEndDate: "",
longTerm: false,
@ -2461,9 +2466,12 @@ export default {
data.menuList.forEach((item)=>{
if(item.actionList){
item.actionList.forEach((item2)=>{
if(item2.actionCode = 'akey_issued'){
if(item2.actionCode == 'akey_issued'){
this.key = true
} else {
this.key = false
}
console.log('this.key',this.key)
})
}
})
@ -3178,7 +3186,8 @@ export default {
// 新增 || 编辑 人员录入 保存按钮
savePersonFn(formName) {
console.log(this.personForm);
this.personForm.isUploadHousing = this.personForm.isUploadHousing ? 1 : 0
console.log('进场确定参数',this.personForm);
if (!IdentityCodeValid(this.personForm.idCard)) {
this.$message.error(this.$t("message.laborMange.correctCellIdCard"));
return;
@ -3265,8 +3274,11 @@ export default {
let data = this.personForm;
data.longTerm = this.personForm.longTerm ? 1 : 0;
data.registerType = 1;
// 跟杨珊对接需要再再次进场时多传入一个新的字段
data.reEntry = 1
data.userId = this.$store.state.userInfo.userId;
if (this.personForm.ufaceDevId.length > 0) {
console.log('this.personForm.ufaceDevId',this.personForm.ufaceDevId)
data.ufaceDevId = this.personForm.ufaceDevId.join(",");
} else {
data.ufaceDevId = "";
@ -3307,6 +3319,7 @@ export default {
isUploadHousing: value ? 1 : 0,
id: id,
};
console.log('isUploadHousing',json)
updateByIdWorkerInfo(json).then((res) => {
// if (res.code == 200) {
// this.$message.success(this.$t("message.laborMange.modifySuccess"));
@ -3323,6 +3336,12 @@ export default {
},
//编辑 人员信息 按钮
editWorkerInfo(value, type) {
console.log('当前行',value)
if(value.isUploadHousing){
this.personForm.isUploadHousing = 1
}else{
this.personForm.isUploadHousing = 0
}
this.personDialogTitle = this.$t("message.laborMange.editCrewInfo");
this.titleType = "edit";
this.personForm = {
@ -3339,7 +3358,7 @@ export default {
phoneNumber: "",
emergentPerson: "",
emergentPhone: "",
inserviceType: 1,
inserviceType: 2,
politicsStatus: "",
marry: "",
payRollBankName: "",

2
src/views/projectFront/laborManage/personnelOverview.vue
View File

@ -652,7 +652,7 @@ export default {
};
getRealTimeDataApi(data).then((res) => {
console.log(res);
console.log('查询结果',res);
if (res.code == 200) {
this.crewRealTimeList = res.result;
this.$nextTick(() => {

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

@ -55,6 +55,9 @@
$t("message.deviceManage.query")
}}</el-button>
<el-button type="warning" size="medium" plain @click="refresh">{{$t('message.deviceManage.refresh')}}</el-button>
<el-button type="primary" size="medium" plain @click="exportBtn">
<a :href="printUrl" class="printUrl">导出</a>
</el-button>
</el-form-item>
</el-form>
</div>
@ -106,12 +109,13 @@
</div>
</template>
<script>
import { selectWorkerEducationPageApi } from "@/assets/js/api/laborPerson";
import { selectWorkerEducationPageApi,exportExcelWorkerEducationApi } from "@/assets/js/api/laborPerson";
export default {
name: "historyData",
data() {
return {
printUrl:'',
projectSn: "",
time: [],
formInline: {
@ -154,6 +158,14 @@ export default {
this.pageSize = 10;//条数
this.onSubmit();
},
// 导出
exportBtn(){
console.log('导出')
this.printUrl = this.$http.defaults.baseURL + 'xmgl/safeEducationQuestion/exportExcelWorkerEducation?projectSn=' +
this.projectSn + '&eduType=' + this.formInline.eduType + '&eduCourseName=' + this.formInline.eduCourseName
+ '&workerName=' + this.formInline.workerName
console.log(this.printUrl)
},
//查询列表
onSubmit() {
if (this.time.length == 0 || this.time == null) {
@ -190,4 +202,7 @@ export default {
};
</script>
<style lang="less" scoped>
.printUrl{
text-decoration: none;
}
</style>