diff --git a/public/js/config.js b/public/js/config.js index 24db889a..e44b4daf 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,4 +1,4 @@ -var COMPANY = ''; //通用 +// var COMPANY = ''; //通用 // var COMPANY='zhongjian'; //中建,和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -10,7 +10,8 @@ var COMPANY = ''; //通用 // COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'yunlian'//云联万物 // COMPANY = 'neimenggu'//内蒙古项目 -// COMPANY = 'zjsj'//中建四局 +// COMPANY = 'zjsj'//中建四局 +COMPANY = 'zjwj'//中建五局 diff --git a/src/assets/js/api/quality.js b/src/assets/js/api/quality.js index 1f6a9d2a..12c40599 100644 --- a/src/assets/js/api/quality.js +++ b/src/assets/js/api/quality.js @@ -169,3 +169,22 @@ export const addMakeAnAppointmentItem = data=>post('/xmgl/weight/weighBookVehicl export const editMakeAnAppointmentItem = data=>post('/xmgl/weight/weighBookVehicleInfo/edit',data) export const deleteMakeAnAppointmentItem = data=>post('/xmgl/weight/weighBookVehicleInfo/delete',data) export const weighTypeList = data=>get('/xmgl/weight/weighBookVehicleInfo/weighingType',data) + + +//整改排名 +export const getDepartmentListApi = data=>get('/xmgl/qualityInspectionRecord/department/rectified/rank',data) + + +//人员管理_部门 +export const addDepartmentInfoApi = data=>post('/xmgl/departmentInfo/add',data) +export const deleteDepartmentInfoApi = data=>post('/xmgl/departmentInfo/delete',data) +export const editDepartmentInfoApi = data=>post('/xmgl/departmentInfo/edit',data) +export const getDepartmentInfoListApi = data=>post('/xmgl/departmentInfo/getDepartmentInfoList',data) + +//人员管理_人员 +export const addSystemUserApi = data=>post('/xmgl/systemUser/zjwj/add',data) +export const deletSystemUserApi = data=>post('/xmgl/systemUser/zjwj/delete',data) +export const editSystemUserApi = data=>post('/xmgl/systemUser/zjwj/update',data) +export const getSystemUserPageApi = data=>get('/xmgl/systemUser/zjwj/list',data) + + diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 1caa4dab..e1cabcca 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -81,6 +81,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地 // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 diff --git a/src/router/index.js b/src/router/index.js index 9dfbce4a..a4289a0e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -760,6 +760,16 @@ const routes2 = [ name: '质量管理_分部分项工程', component: resolve => require(['@/views/projectFront/quality/subdivisionalWorks.vue'], resolve) }, + { + path: '/project/quality/rectificationRanking', //质量管理 -- 整改排名 + name: '质量管理_整改排名', + component: resolve => require(['@/views/projectFront/quality/rectificationRanking.vue'], resolve) + }, + { + path: '/project/quality/qualitypersonnel', //质量管理 -- 整改排名 + name: '质量管理_人员管理', + component: resolve => require(['@/views/projectFront/quality/qualitypersonnel.vue'], resolve) + }, { path: '/project/quality/materialManagement', //质量管理 -- 物料管理 --称重信息 name: '物料管理_称重信息', @@ -2544,6 +2554,7 @@ const routes2 = [ name: '质量管理_数据中心', component: resolve => require(['@/views/projectFront/quality/recordsCenter.vue'], resolve) }, + // 材料管理 { path: '/projectQu/materialManage/constructionTeamManage', diff --git a/src/store/index.js b/src/store/index.js index 4236c85e..a6005bab 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -87,8 +87,10 @@ export default new Vuex.Store({ // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 - UPLOADURL: 'http://192.168.34.221:8070/upload/image',//郭圣雄本地 - FILEURL: 'http://192.168.34.221:8070/image/',//郭圣雄本地 + UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 + FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地 + // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地 // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 diff --git a/src/views/projectFront/quality/qualitypersonnel.vue b/src/views/projectFront/quality/qualitypersonnel.vue new file mode 100644 index 00000000..39a00920 --- /dev/null +++ b/src/views/projectFront/quality/qualitypersonnel.vue @@ -0,0 +1,535 @@ + + + + + + 部门名称 + + 新增部门 + + + + + + {{ item.departmentName }} + + + + + + + + + + + + + 人员信息 + + 人员录入 + + + + + + + + + + + + + + 编辑 + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue index 60c983aa..c45e44b8 100644 --- a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue +++ b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue @@ -38,6 +38,17 @@ >{{ $t('message.quality.toCheck') }}: {{ statisticsValue.verificationNum }} + + 整改率: + {{ + statisticsValue.rectificationRatio + }}% + 闭合率: + {{ statisticsValue.completeRatio }}% + + + {{ $t('message.quality.inquire') @@ -315,6 +336,7 @@ >{{ $t('message.quality.qualityProblem') }} {{ $t('message.quality.recordsOfTheFebruary') }} + + + {{ $t('message.quality.positionOnTheDrawing') }} + + - + @@ -643,9 +668,9 @@ >