diff --git a/src/assets/i18n/langs/cn/carManage/carManage.js b/src/assets/i18n/langs/cn/carManage/carManage.js index 37165533..7f6f431b 100644 --- a/src/assets/i18n/langs/cn/carManage/carManage.js +++ b/src/assets/i18n/langs/cn/carManage/carManage.js @@ -36,7 +36,7 @@ export default { reserveEndTime: '预约结束时间', entryAndExitPermit: '允许进出次数', carType2: '车型', - carTypeArr: ['渣土车辆', '外来车辆', '工作车辆'],//1渣土车辆，2外来车辆，3工作车辆 + carTypeArr: ['渣土车辆', '临时车辆', '工作车辆'],//1渣土车辆，2临时车辆，3工作车辆 // createTime: '创建时间', driverName: '司机姓名', driverTelephone: '司机电话', diff --git a/src/assets/i18n/langs/cn/dangerousBigProject/index.js b/src/assets/i18n/langs/cn/dangerousBigProject/index.js index f0401a40..828a9da1 100644 --- a/src/assets/i18n/langs/cn/dangerousBigProject/index.js +++ b/src/assets/i18n/langs/cn/dangerousBigProject/index.js @@ -12,6 +12,7 @@ export default { subpackageUnit: '分包单位', buildSchedule: '施工进度', safeStatus: '安全状态', + finalAcceptanceStatus: '最终验收状态', item: '条', nothing: '无', record: '记录于', diff --git a/src/assets/i18n/langs/cn/laborManage/personnelOverview.js b/src/assets/i18n/langs/cn/laborManage/personnelOverview.js index fd7f4c4e..56ffd264 100644 --- a/src/assets/i18n/langs/cn/laborManage/personnelOverview.js +++ b/src/assets/i18n/langs/cn/laborManage/personnelOverview.js @@ -21,7 +21,7 @@ export default { specialOperation: '特种作业人员', generalOperator: '一般作业人员', outsourcedEmployee: '外包工', - lwWorker:'劳务工', + lwWorker:'施工人员', dayLaborer: '临时工', registeredNumber: '在册人数', presentNumber: '在场人数', diff --git a/src/assets/i18n/langs/en/carManage/carManage.js b/src/assets/i18n/langs/en/carManage/carManage.js index 72d855d7..a2ba1198 100644 --- a/src/assets/i18n/langs/en/carManage/carManage.js +++ b/src/assets/i18n/langs/en/carManage/carManage.js @@ -6,7 +6,7 @@ export default { carNumber: 'license plate number', carPhotosUrl: 'Vehicle images', carType: 'vehicle type', - carTypeArr: ['Residue in the vehicle', 'foreign vehicle', 'operational vehicle'],//1渣土车辆，2外来车辆，3工作车辆 + carTypeArr: ['Residue in the vehicle', 'foreign vehicle', 'operational vehicle'],//1渣土车辆，2临时车辆，3工作车辆 // createTime: '创建时间', driverName: 'DriverName', driverTelephone: 'The driver phone', diff --git a/src/assets/js/api/dangerousBigProject.js b/src/assets/js/api/dangerousBigProject.js index ccaf8f08..59bb178b 100644 --- a/src/assets/js/api/dangerousBigProject.js +++ b/src/assets/js/api/dangerousBigProject.js @@ -72,8 +72,12 @@ export const selectDangerousEngineeringProgressRecordApi = data => post('xmgl/da export const selectDangerousEngineeringSideStationApi = data => post('xmgl/dangerousEngineeringSideStation/selectList', data); // 分页列表查询危大工程-验收记录信息 export const selectDangerousEngineeringAcceptanceCheckApi = data => post('xmgl/dangerousEngineeringAcceptanceCheck/selectlist', data); +// 分页列表查询危大工程-最终验收记录信息 +export const selectFinalDangerousEngineeringAcceptanceCheckApi = data => get('xmgl/xzDangerousEngineeringAcceptance/list', data); +export const deleteFinalDangerousEngineeringAcceptanceCheckApi = data => post('xmgl/xzDangerousEngineeringAcceptance/delete', data); // 分页列表查询隐患检查记录信息 export const selectHiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/list', data); +export const selectFinalHiddenDangerInspectRecordApi = data => post('xmgl/xzSecurityQualityInspectionRecord/list', data); // 删除危大工程-验收记录信息 export const deleteDangerousEngineeringAcceptanceCheckApi = data => post('xmgl/dangerousEngineeringAcceptanceCheck/delete', data); // 删除现场危大工程-进度记录信息 @@ -81,4 +85,5 @@ export const deleteDangerousEngineeringProgressRecordApi = data => post('xmgl/da // 删除危大工程-旁站记录信息 export const deleteDangerousEngineeringSideStationApi = data => post('xmgl/dangerousEngineeringSideStation/delete', data); // 删除隐患记录 -export const deletehiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/delete', data); \ No newline at end of file +export const deletehiddenDangerInspectRecordApi = data => post('xmgl/hiddenDangerInspectRecord/delete', data); +export const deleteFinlahiddenDangerInspectRecordApi = data => post('xmgl/xzSecurityQualityInspectionRecord/delete', data); \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index c2c3716c..82bddebf 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,9 +84,9 @@ 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://182.90.224.237:51234' //郭圣雄远程 // 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 9860fd60..a6262f9e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,9 +48,9 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/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',//测试工作流地址(本地) + UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄 + FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄 + WORKFLOWURL: 'http://localhost:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试 diff --git a/src/views/projectFront/aiAnalysis/warningList.vue b/src/views/projectFront/aiAnalysis/warningList.vue index f1fd3dcf..ad1819cf 100644 --- a/src/views/projectFront/aiAnalysis/warningList.vue +++ b/src/views/projectFront/aiAnalysis/warningList.vue @@ -67,6 +67,7 @@ v-model="dateRangeArr" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" + :default-time="['00:00:00', '23:59:59']" :range-separator="$t('message.sixComplete.to')" :start-placeholder="$t('message.sixComplete.start')" :end-placeholder="$t('message.sixComplete.end')" diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue index 7c016384..1c325029 100644 --- a/src/views/projectFront/carManage/carManage.vue +++ b/src/views/projectFront/carManage/carManage.vue @@ -175,13 +175,13 @@ @@ -469,7 +469,7 @@ 固定车辆 长期车辆 - 外来车辆 + 临时车辆 @@ -898,7 +898,7 @@
司机电话：
是否黑名单：
车辆图片：
-
固定/长期/外来车辆：
+
固定/长期/临时车辆：
预约时间：
允许进出次数：
车辆下发状态：
@@ -966,10 +966,10 @@
- 固定/长期/外来车辆： + 固定/长期/临时车辆： 固定车辆 长期车辆 - 外来车辆 + 临时车辆
diff --git a/src/views/projectFront/dangerousBigProject/addPlan.vue b/src/views/projectFront/dangerousBigProject/addPlan.vue index ca8c05be..f997b5d2 100644 --- a/src/views/projectFront/dangerousBigProject/addPlan.vue +++ b/src/views/projectFront/dangerousBigProject/addPlan.vue @@ -51,7 +51,7 @@ - + - - - - - - + + + + +
@@ -676,10 +674,10 @@ export default { this.$message.error('请输入施工部位！') return; } - if(!this.addForm.buildTime){ - this.$message.error('请选择施工时间！') - return; - } + // if(!this.addForm.buildTime){ + // this.$message.error('请选择施工时间！') + // return; + // } if(!this.addForm.responsibilityCompanyId){ this.$message.error('请选择责任分包单位！') return; @@ -697,8 +695,8 @@ export default { personLiableId, engineeringTypeId, engineeringTypeName, - buildStartTime: this.addForm.buildTime[0], - buildEndTime: this.addForm.buildTime[1], + // buildStartTime: this.addForm.buildTime[0], + // buildEndTime: this.addForm.buildTime[1], planStartTime: this.addForm.planTime[0] ? this.addForm.planTime[0]:'', planEndTime: this.addForm.planTime[1] ? this.addForm.planTime[1]:'', // typeDescribeId: this.addForm.typeDescribeId.join(','), diff --git a/src/views/projectFront/dangerousBigProject/detail.vue b/src/views/projectFront/dangerousBigProject/detail.vue index 5dac9721..741cc292 100644 --- a/src/views/projectFront/dangerousBigProject/detail.vue +++ b/src/views/projectFront/dangerousBigProject/detail.vue @@ -13,7 +13,7 @@
- 危大工程已结束 + > -->
@@ -85,7 +85,7 @@ > - - + --> - - - - + + + + 最终验收
@@ -316,7 +316,7 @@
验收描述：{{ checkData.length > 0 - ? checkData[0].acceptanceDescribe + ? checkData[0].acceptanceDesc : "- -" }}
- + - - - - + --> - @@ -115,12 +109,12 @@ - - @@ -178,8 +172,18 @@
- + + + + + @@ -519,6 +523,10 @@ export default { }, methods: { editRow(index, rows) { + if(rows[index].finalAcceptanceStatus === 2){ + this.$message.warning('该项危大工程已闭合，请勿操作') + return + } // console.log(index,rows[index].id) this.editId = rows[index].id this.operateTitle = "编辑" @@ -785,6 +793,10 @@ export default { this.multipleSelection = val; }, deleteRow(index, rows) { + if(rows[index].finalAcceptanceStatus === 2){ + this.$message.warning('该项危大工程已闭合，请勿操作') + return + } // console.log(index,rows[index].id) this.deleteId = rows[index].id this.deleteDialog = true diff --git a/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue b/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue index 7ca41b48..57015f5b 100644 --- a/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue +++ b/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue @@ -372,7 +372,7 @@ export default { cpsEleRecords: [], // 选修必修人员数组 studyCycle: [], // 表单日期时间范围 searchKeyWord: '', // 搜索关键字 - personType: 0, // 人员类型 + personType: 1, // 人员类型 userEnterpriseId: '1706588724057112577', // 用户所处企业Id(测试) projectSn: '', // 项目Sn @@ -429,10 +429,10 @@ export default { this.getExamSubjectList() // this.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId; this.userEnterpriseId = "1706588724057112577";//测试用 - + this.personType = 1 // this.getTeamInfoList() // this.getDepartmentList() - this.loadData() // 查询班组及部门 + this.loadData() }, mounted() {}, watch:{ @@ -474,11 +474,11 @@ export default { listExamSubjectApi(data).then((res) => { if (res.code == 200) { this.examSubjectList = res.result - console.log('==========考试科目列表==========',this.listData) + console.log('==========考试科目列表==========',this.examSubjectList) } }) }, - async loadData(){ // 按顺序加载方法 查询班组及部门 + async loadData(){ // 按顺序加载方法 await this.getTeamInfoList() await this.getDepartmentList() // await this.getWorkerInfoList() @@ -722,8 +722,7 @@ export default { if(this.personType ===2) this.$refs.personTree2.filter(newArr); if(this.personType ===3) this.$refs.personTree3.filter(newArr); }, - async handleOpen() { // 打开弹窗 - this.personType = 1 + async handleOpen() { // 添加按钮 await this.getExamSubjectList() // this.getWorkerInfoList() await this.getLaborPersonList() diff --git a/src/views/projectFront/examSystem/trainRecord/trainRecord.vue b/src/views/projectFront/examSystem/trainRecord/trainRecord.vue index 532239ad..f72a8b04 100644 --- a/src/views/projectFront/examSystem/trainRecord/trainRecord.vue +++ b/src/views/projectFront/examSystem/trainRecord/trainRecord.vue @@ -293,6 +293,7 @@ export default { }, } +