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

fix: 冲突解决

Browse Source
This commit is contained in:
kun 2024-05-24 21:42:25 +08:00
commit e717f7e8ef
6 changed files with 132 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/assets/i18n/langs/cn/laborManage/personManage.js
View File

@ -205,7 +205,8 @@ export default {
aKeyIssued: '一键下发',
faceDevice: '人脸设备',
checkAll: '全选',
contractInfo: '合同信息',
// contractInfo: '合同信息',
contractInfo: '劳动合同',
hint4: '已执行人员下发命令',
hint5: "附件格式错误，请重新上传!",
hint6: "导入成功",
@ -778,7 +779,8 @@ export default {
medicalFitness: '体检合格',
medicalFailure: '体检不合格',
conclusion: '结论',
insuranceInfo: '保险信息',
// insuranceInfo: '保险信息',
insuranceInfo: '工伤保险',
deleteInsuranceInfoHint: "确定删除该保险信息?",
dateOfPurchase: '保险购买日期',
dateOfExpiryOfInsurance: '保险到期日期',

4
src/assets/js/http.js
View File

@ -84,10 +84,10 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目

8
src/views/projectFront/examSystem2/examManagement/examManagement.vue
View File

@ -864,8 +864,12 @@ export default {
this.examForm.questions = this.$refs.questionListTable.selection;
} else {
let arr = [];
this.examForm.questions.split(',').map(item => {
arr.push({id: item})
this.questionList.map(item => {
this.examForm.questions.split(',').map(item2 => {
if(item.id === item){
arr.push({id: item,type: item2.type})
}
})
})
this.examForm.questions = arr;
}

2
src/views/projectFront/examSystem2/questionManagement/questionManagement.vue
View File

@ -723,6 +723,7 @@ export default {
this.checkList.map(item =>{
multiOptions += this.optionStr(item)
})
multiOptions = this.sortedOptions(multiOptions)
console.log(this.questionForm)
editQuestionBankApi({
id:this.questionForm.id,
@ -765,6 +766,7 @@ export default {
this.checkList.map(item =>{
multiOptions += this.optionStr(item)
})
multiOptions = this.sortedOptions(multiOptions)
addQuestionBankApi({
questionName:this.questionForm.questionName,
type:this.questionForm.type,

180
src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
View File

@ -26,7 +26,7 @@
</el-form>
</div>
<!-- table -->
<div class="table_wrap whiteBlock" style="height: 677px">
<div class="table_wrap whiteBlock" style="height: 666px">
<el-table class="tables" :data="listData" height="200">
<el-table-column type="index" width="80" label="序号" align="center"></el-table-column>
<el-table-column align="center" prop="name" label="培训计划名称"></el-table-column>
@ -41,14 +41,14 @@
<el-table-column align="center" prop="createByName" label="创建人"></el-table-column>
<el-table-column align="center" prop="completeRadio" label="培训完成率">
<template slot-scope="scope">
<!-- {{scope.row.completeRadio?scope.row.completeRadio+'%':'--'}} -->
{{scope.row.completeRadio}}%
{{scope.row.completeRadio !== null ? scope.row.completeRadio+'%' : '--'}}
<!-- {{scope.row.completeRadio}}% -->
</template>
</el-table-column>
<el-table-column align="center" prop="passRadio" label="培训通过率">
<template slot-scope="scope">
<!-- {{scope.row.passRadio?scope.row.passRadio+'%':'--'}} -->
{{scope.row.passRadio}}%
{{scope.row.passRadio !== null ? scope.row.passRadio+'%' : '--'}}
<!-- {{scope.row.passRadio}}% -->
</template>
</el-table-column>
<el-table-column width="220" label="操作" align="center">
@ -69,7 +69,7 @@
layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background></el-pagination>
</div>
<!-- 新增 -->
<el-dialog :modal-append-to-body="false" :destroy-on-close="true" :title="title" :visible.sync="dialogVisible" width="1000px">
<el-dialog :modal-append-to-body="false" :destroy-on-close="true" :title="title" :visible.sync="dialogVisible" width="1200px">
<el-steps :active="active" align-center>
<el-step title="教育信息"></el-step>
<el-step title="人员信息"></el-step>
@ -134,11 +134,11 @@
<div class="dialogContainer2" v-show="active == 2">
<div class="d2Right" style="width:100%;">
<div class="addbtn">
<el-button type="primary" size="medium" @click="addlocal"> 添加作业人员</el-button>
<el-button type="primary" size="medium" @click="addlocal"> 添加人员</el-button>
</div>
<el-table class="tables" :data="selectWorkerList" style="min-height:425px">
<el-table class="tables" :data="selectWorkerList" style="min-height:425px" height="500">
<!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
<el-table-column type="index" label="序号" align="center"></el-table-column>
<el-table-column type="index" label="序号" width="80px" align="center"></el-table-column>
<el-table-column align="center" prop="workerName" label="姓名"></el-table-column>
<el-table-column align="center" prop="idCard" label="身份证"></el-table-column>
<el-table-column align="center" label="班组/部门">
@ -154,15 +154,18 @@
</el-table-column> -->
<el-table-column align="center" prop="enterDate" label="进场日期"></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div style="display:flex">
<div @click="onSelectWorker(scope.row)" style="margin-left:10px;" class="operationText">
<img src="@/assets/images/tableIcon/icon-delete.png" width="15px" height="15px" />
<span style="white-space: nowrap;display:flex;align-items:center">删除</span>
</div>
</div>
</template>
</el-table-column>
<template slot-scope="scope">
<el-button size="medium" type="text" style="color:#ec4b52" class="delete-btn" icon="el-icon-delete" @click="onSelectWorker(scope.row)">
<span style="color:black">删除</span>
</el-button>
<!-- <div style="display:flex;justify-content:center">
<div @click="onSelectWorker(scope.row)" style="margin-left:10px;" class="operationText">
<img src="@/assets/images/tableIcon/icon-delete.png" width="15px" height="15px" />
<span style="white-space: nowrap;display:flex;align-items:center">删除</span>
</div>
</div> -->
</template>
</el-table-column>
</el-table>
<!-- <el-pagination class="pagerBox" style="margin-top: 8px;" @size-change="sizeChange" @current-change="currentChange"
:current-page="question.pageNo" :page-sizes="$store.state.PAGESIZRS"
@ -178,13 +181,13 @@
定</el-button>
</div>
</el-dialog>
<!-- 添加作业人员 -->
<el-dialog :modal-append-to-body="false" :title="'添加作业人员'" :visible.sync="dialogVisible3" width="1000px">
<!-- 添加人员 -->
<el-dialog :modal-append-to-body="false" :title="'添加人员'" :visible.sync="dialogVisible3" width="1200px">
<div class="dialogContainer2" v-show="active == 2">
<div class="d2Right">
<div class="addbtn" style="justify-content:flex-start">
<el-form :inline="true" size="medium" class="demo-form-inline">
<el-form :inline="true" ref="searchRef" size="medium" class="demo-form-inline">
<!-- <el-form-item label="选择企业" prop="enterpriseId"> -->
<el-form-item label="" prop="enterpriseId">
<el-select v-model="workerInfo.enterpriseId" placeholder="请选择企业" @change="getTeamInfoList" clearable="">
@ -192,16 +195,16 @@
</el-select>
</el-form-item>
<!-- <el-form-item label="选择班组" prop="teamId"> -->
<el-form-item label="" prop="teamId">
<el-select v-model="workerInfo.departmentAndTeam" placeholder="请选择班组/部门" clearable="">
<el-form-item label="" prop="departmentAndTeam">
<el-select v-model="workerInfo.departmentAndTeam" placeholder="请选择班组/部门" value-key="gtMaterialDepartmentTeamId" clearable>
<!-- <el-option v-for="item in teamInfoList" :key="item.id" :label="item.teamName" :value="item.id"></el-option> -->
<el-option v-for="item in teamInfoList" :key="item.id" :label="item.departmentTeamName" :value="item"></el-option>
<el-option v-for="(item) in teamInfoList" :key="item.gtMaterialDepartmentTeamId" :label="item.departmentTeamName" :value="item"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="workerName">
<el-input placeholder="请搜索姓名" v-model="workerInfo.workerName" suffix-icon="el-icon-search"></el-input>
</el-form-item>
<el-form-item prop="questionName">
<el-form-item>
<el-button class="expintBtn" suffix-icon="el-icon-search" size="medium" type="primary" @click="inquire(1)">
查询
</el-button>
@ -214,7 +217,7 @@
<el-table class="tables" ref="multipleTable" :data="workerList" style="min-height:425px">
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column type="index" label="序号" align="center"></el-table-column>
<el-table-column type="index" width="80px" label="序号" align="center"></el-table-column>
<el-table-column align="center" prop="workerName" label="姓名"></el-table-column>
<el-table-column align="center" prop="idCard" label="身份证"></el-table-column>
<el-table-column align="center" prop="enterpriseName" label="企业"></el-table-column>
@ -226,7 +229,7 @@
<!-- <el-table-column align="center" prop="departmentName" label="部门"></el-table-column>
<el-table-column align="center" prop="teamName" label="班组"></el-table-column> -->
<el-table-column align="center" prop="typeName" label="工种"></el-table-column>
<el-table-column align="center" prop="age" label="年龄"></el-table-column>
<el-table-column align="center" width="55" prop="age" label="年龄"></el-table-column>
<el-table-column align="center" prop="enterDate" label="进场日期"></el-table-column>
</el-table>
@ -244,7 +247,7 @@
</el-dialog>
</div>
</div>
<div style="height: 100%;z-index:999;" v-else>
<div style="z-index:999;" v-else>
<el-page-header style="z-index:999;"
@back="goBack"
:content="dialogTitle"
@ -327,11 +330,11 @@ export default {
dialogVisible: false, //新增弹窗
dialogVisible2: false, //新增二级弹窗
dialogVisible3: false, //新增三级弹窗
workerInfo: {
id: '',
enterpriseId: '',
departmentAndTeam:{}
},
// workerInfo: {
// id: '',
// enterpriseId: '',
// departmentAndTeam:{}
// },
listData: [],
subjectId:'',
listData3: [
@ -356,7 +359,8 @@ export default {
workerInfo:{
workerName:"",
teamId:"",
enterpriseId:""
enterpriseId:"",
departmentAndTeam:null
},
worker: {
//公用分页
@ -368,6 +372,7 @@ export default {
teamInfoList:[],
enterpriseInfoList:[],
selectWorkerList:[],
selectedWorkerList:[],
examCourseList:[],
title:"",
@ -381,6 +386,7 @@ export default {
if(this.title = '新增'){
this.$refs.examForm.resetFields()
}
this.selectWorkerList = []
}
},
// subjectId(newV,oldV){
@ -406,21 +412,10 @@ export default {
this.getExamSubjectList();
this.getPaperList();
this.getTeamInfoList();
// this.getTeamInfoList();
this.getEnterpriseInfoList();
},
methods: {
// getTeamList(){
// //获取企业的 - 班组列表
// let data = {
// enterpriseId: this.workerInfo.enterpriseId,
// projectSn: this.projectSn,
// };
// getTeamInfoList(data).then((res) => {
// this.teamListData = res.result.list;
// });
// },
getCourseList(){
listCourseApi({
projectSn: this.projectSn,
@ -450,14 +445,57 @@ export default {
},
addlocal(){
this.getWorkerInfoList();
this.dialogVisible3=true;
setTimeout(() => {
this.$nextTick(() => {
// for(let i=0;i<this.workerList.length;i++ ){
// for(let j=0;i<this.selectedWorkerList.length;j++){
// if(this.workerList[i].id == this.selectedWorkerList[j].id){
// console.log(this.workerList[i])
// console.log(this.selectedWorkerList[j])
// this.$refs.multipleTable.toggleRowSelection(this.workerList[i],true)
// }
// }
// }
// this.workerList.map((item,index) => {
// this.selectedWorkerList.map((item2,index2) => {
// if(item.id === item2.id){
// this.$refs.multipleTable.toggleRowSelection(this.workerList[index],true)
// }
// })
// })
})
},10)
this.dialogVisible3 = true;
// this.$nextTick(() => {
// for(let i=0;i<this.questionList.length;i++){
// for(let j = 0;j<tempStr.length;j++){
// if(tempStr[j] == this.questionList[i].id){
// this.$refs.questionListTable.toggleRowSelection(this.questionList[i],true)
// }
// }
// }
// })
},
localSubmitBtn(){
this.selectWorkerList = this.$refs.multipleTable.selection;
this.selectedWorkerList = this.$refs.multipleTable.selection
if(this.selectWorkerList.length === 0){
this.selectWorkerList = this.selectedWorkerList
}else{
let concatArr = this.selectWorkerList.concat(this.selectedWorkerList)
let tempArr = concatArr.filter((item,index) => {
return concatArr.findIndex(t => t.id === item.id) === index
})
this.selectWorkerList = tempArr
this.selectedWorkerList = this.selectWorkerList
}
// this.selectWorkerList = this.$refs.multipleTable.selection;
console.log("------------------",this.selectWorkerList);
this.dialogVisible3= false;
console.log("------------------",this.selectWorkerList);
this.dialogVisible3= false;
},
inquire(flag){
@ -466,7 +504,11 @@ export default {
if(flag == 2) {
this.workerInfo.workerName = "";
this.workerInfo.enterpriseId = "";
this.workerInfo.teamId = "";
this.teamInfoList = []
this.workerInfo = {}
// this.workerInfo.departmentAndTeam = {}
// this.workerInfo.teamId = "";
// this.$refs.searchRef.resetFields
}
this.getWorkerInfoList();
},
@ -509,19 +551,23 @@ export default {
})
},
getTeamInfoList (){
this.workerInfo.departmentAndTeam = ''
let data = {
projectSn: this.projectSn,
enterpriseId: this.workerInfo.enterpriseId?this.workerInfo.enterpriseId:'',
}
// getTeamInfoListApi(data).then((res)=>{
getQueryDepartmentListApi(data).then((res)=>{
if (res.code == 200) {
this.teamInfoList = res.result
console.log('==========班组列表--'+this.personType+'==========',this.teamInfoList)
// this.workerInfo.departmentAndTeam = null
if(this.workerInfo.enterpriseId){
let data = {
projectSn: this.projectSn,
enterpriseId: this.workerInfo.enterpriseId?this.workerInfo.enterpriseId:'',
}
})
// getTeamInfoListApi(data).then((res)=>{
getQueryDepartmentListApi(data).then((res)=>{
if (res.code == 200) {
this.teamInfoList = res.result
console.log('==========班组列表--'+this.personType+'==========',this.teamInfoList)
this.workerInfo.departmentAndTeam = null
}
})
}else{
this.teamInfoList = []
this.workerInfo.departmentAndTeam = null
}
},
next(examForm) {
// if(this.active == 2) {
@ -735,7 +781,8 @@ export default {
workerCard: item.idCard,
workerTeam: item.departmentName+item.teamName,
workType: item.typeName,
entryTime: item.enterDate
entryTime: item.enterDate,
enterpriseId: item.enterpriseId
}
tempList.push(tempObj)
})
@ -753,6 +800,7 @@ export default {
this.$message.success('新增成功')
this.dialogVisible = false
this.getRecordList()
this.selectWorkerList = []
})
} else {
// upSubdivisionProjectApi(this.workerInfo).then((res) => {
@ -993,7 +1041,7 @@ export default {
display: flex;
justify-content: space-between;
width: 100%;
height: 575px;
height: 505px;
.d2Left {
width: 25%;

7
src/views/projectFront/examSystem2/trainRecord/trainRecord.vue
View File

@ -1,6 +1,6 @@
<template>
<div style="height:100%">
<div class="assessmentCentent whiteBlock" style="height:707px">
<div style="">
<div class="assessmentCentent whiteBlock" style="height:709px">
<!-- <div class="searchBox whiteBlock">
<el-form :inline="true" size="medium" class="demo-form-inline">
<el-form-item>
@ -38,6 +38,7 @@
{{trainPlan.subjectName}}
</template>
</el-table-column>
<el-table-column prop="examPaperName" :label="'考试名称'"></el-table-column>
<el-table-column :label="'培训计划名称'">
<template>
{{trainPlan.name}}
@ -313,7 +314,7 @@ export default {
.assessmentCentent {
width: 100%;
// height: 100%;
height: 667px;
height: 666px;
box-sizing: border-box;
}
.rewards_wrap {