diff --git a/src/assets/js/api/quality.js b/src/assets/js/api/quality.js index 511de0a8..9c7f95d2 100644 --- a/src/assets/js/api/quality.js +++ b/src/assets/js/api/quality.js @@ -14,6 +14,7 @@ export const editDangerItemRecordApi = data => post('xmgl/dangerItemRecord/edit export const getDangerItemRecordApi = data => post('xmgl/dangerItemRecord/list', data); //质量问题库信息 列表信息---右边 export const getCompanyDangerItemRecordApi = data => post('xmgl/dangerItemRecord/selectCompanyDangerItemRecordList', data); //企业质量问题库信息 列表信息---右边 export const delDangerItemRecordApi = data => post('xmgl/dangerItemRecord/delete', data); // 删除质量问题库—子项信息 +export const delDangerTypeRecordApi = data => get('/xmgl/dangerTypeRecord/deleteByDangerTypeId',data) // 删除 左边 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 94fad474..e39128ae 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,10 +41,10 @@ if (process.env.NODE_ENV == 'development') { // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 + // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; diff --git a/src/router/index.js b/src/router/index.js index 587c31e6..2059e74a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -135,6 +135,7 @@ const routes2 = [ name: '视频监控_视频中心', component: () => import('@/views/companyFront/videoManage/playVideo.vue') }, + // 企业前台 塔吊工效分析 { path: '/firm/towerManage', name: 'towerManage', diff --git a/src/views/companyAdmin/basicSetup/checkItem.vue b/src/views/companyAdmin/basicSetup/checkItem.vue index 3fb68cca..829a806b 100644 --- a/src/views/companyAdmin/basicSetup/checkItem.vue +++ b/src/views/companyAdmin/basicSetup/checkItem.vue @@ -90,13 +90,13 @@ @click="edit1(name, 1)" style="font-size: 14px" > - + @click="del1(name.id,1)" + > @@ -432,6 +432,7 @@ import { addDangerTypeRecordApi, editDangerTypeRecordApi, delDangerItemRecordApi, + delDangerTypeRecordApi, getCompanyDangerTypeRecordApi, addDangerItemRecordApi, editDangerItemRecordApi, @@ -629,8 +630,8 @@ export default { this.dialogdata = data; }, delSave1() { - delDangerItemRecordApi({ id: this.editId }).then((res) => { - console.log('========',res) + if(this.type == 3){ + delDangerItemRecordApi({ id: this.editId }).then((res) => { if (res.code == 200) { this.$message({ message: '删除成功', @@ -646,6 +647,25 @@ export default { } this.dialogVisible1 = false; }); + }else{ + delDangerTypeRecordApi({ id: this.editId }).then((res) => { + if (res.code == 200) { + this.$message({ + message: '删除成功', + type: 'success', + }); + this.loadList(); + this.loadRigthtList() + } else { + this.$message({ + message: '删除失败', + type: "error", + }); + } + this.dialogVisible1 = false; + }); + } + // this.dialogVisible1 = false; // this.$message({ // message: "删除成功", @@ -672,7 +692,7 @@ export default { // }); }, del1(id, type) { - console.log(id); + console.log('当前点击的id',id,'类型',type) this.type = type; this.title = "删除"; this.editId = id; diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 3fdfd683..abc10c6a 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -2185,7 +2185,9 @@ export default { '&enterDate=' + this.tableParameter.enterDate + '&codeState=' + - this.tableParameter.codeState + this.tableParameter.codeState + + '&enterpriseId=' + + this.checkedId }, getConfig() { getProjectUfaceConfigInfo({ diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index a60aaf8d..38fc75dc 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -2438,7 +2438,9 @@ export default { '&enterDate=' + this.tableParameter.enterDate + '&codeState=' + - this.tableParameter.codeState + this.tableParameter.codeState + + '&enterpriseId=' + + this.checkedId }, getConfig() { getProjectUfaceConfigInfo({ diff --git a/src/views/projectFront/projectSummary/buildingManage/buildingManagement.vue b/src/views/projectFront/projectSummary/buildingManage/buildingManagement.vue index e9de2a75..7a43c250 100644 --- a/src/views/projectFront/projectSummary/buildingManage/buildingManagement.vue +++ b/src/views/projectFront/projectSummary/buildingManage/buildingManagement.vue @@ -499,11 +499,16 @@ export default { }) }, breadcrumbClick(index){ - console.log(index) + console.log('当前点击的',index) if(this.tableType !== 0 && index === 0){ this.breadcrumbItem.splice(1,this.tableType) this.tableType = 0 } + // if(this.tableType === 1 && index === 1){ + // // console.log('点击的是第二级') + // // console.log('=====',this.breadcrumbItem) + // // this.breadcrumbItem.splice(/* '编辑' */this.$t('message.projectInfo.edit'),1) + // } console.log(this.tableData) }, handleClick(row,buildingIndex,index){