From 4a79925fe1b4393697f6fc847fe07a5161b74600 Mon Sep 17 00:00:00 2001 From: Vce Date: Fri, 24 May 2024 10:21:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BD=AD=E6=9D=B0=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 ++-- src/store/index.js | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 08e97487..1d5eb6a7 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,9 +85,9 @@ if (process.env.NODE_ENV == 'development') { // 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.155:19111/' //彭洁本地 + // 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/' // 百色三标段项目 diff --git a/src/store/index.js b/src/store/index.js index 2b2d9a6f..780aab36 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -50,8 +50,10 @@ export default new Vuex.Store({ // FILEURL:' http://101.43.164.214:11111/image/',// 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // FILEURL:'http://182.90.224.237:51234/image/', - UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 - FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 + // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 + // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 + UPLOADURL: "http://jxj.zhgdyun.com:61212/upload/image/", // 洁本地 + FILEURL: "http://jxj.zhgdyun.com:61212/image/", //洁本地 // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) From 6e6a154683aed3a72467f561804c4a93d32a51ab Mon Sep 17 00:00:00 2001 From: Vce Date: Fri, 24 May 2024 21:40:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18n/langs/cn/laborManage/personManage.js | 6 +- .../examManagement/examManagement.vue | 8 +- .../questionManagement/questionManagement.vue | 2 + .../examSystem2/trainRecord/trainPlan.vue | 180 +++++++++++------- .../examSystem2/trainRecord/trainRecord.vue | 7 +- 5 files changed, 130 insertions(+), 73 deletions(-) diff --git a/src/assets/i18n/langs/cn/laborManage/personManage.js b/src/assets/i18n/langs/cn/laborManage/personManage.js index 6394dc5a..64310e47 100644 --- a/src/assets/i18n/langs/cn/laborManage/personManage.js +++ b/src/assets/i18n/langs/cn/laborManage/personManage.js @@ -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: '保险到期日期', diff --git a/src/views/projectFront/examSystem2/examManagement/examManagement.vue b/src/views/projectFront/examSystem2/examManagement/examManagement.vue index 6ca77414..dd51a7f6 100644 --- a/src/views/projectFront/examSystem2/examManagement/examManagement.vue +++ b/src/views/projectFront/examSystem2/examManagement/examManagement.vue @@ -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; } diff --git a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue index ee52068a..2e61b71f 100644 --- a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue +++ b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue @@ -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, diff --git a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue index 42c6d7f2..94020052 100644 --- a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue +++ b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue @@ -26,7 +26,7 @@ -
+
@@ -41,14 +41,14 @@ @@ -69,7 +69,7 @@ layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background>
- + @@ -134,11 +134,11 @@
- 添加作业人员 + 添加人员
- + - + @@ -154,15 +154,18 @@ --> - - + + - + +
- + @@ -192,16 +195,16 @@ - - + + - + - + 查询 @@ -214,7 +217,7 @@ - + @@ -226,7 +229,7 @@ - + @@ -244,7 +247,7 @@
-
+
{ - // 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.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 { + 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%; diff --git a/src/views/projectFront/examSystem2/trainRecord/trainRecord.vue b/src/views/projectFront/examSystem2/trainRecord/trainRecord.vue index 43c50b02..c2ab9e62 100644 --- a/src/views/projectFront/examSystem2/trainRecord/trainRecord.vue +++ b/src/views/projectFront/examSystem2/trainRecord/trainRecord.vue @@ -1,6 +1,6 @@