diff --git a/main.js b/main.js index 9c60019d..43b3cbdf 100644 --- a/main.js +++ b/main.js @@ -35,16 +35,17 @@ Vue.prototype.COMPANY = "" if (process.env.NODE_ENV === 'development') { // 开发环境 console.log('开发环境') - // // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址(弃用) - // // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 - // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 - Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 + // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址(弃用) + // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 + Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 + // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 - Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 + // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 + Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 diff --git a/pages.json b/pages.json index 8d6f950e..3c3109d0 100644 --- a/pages.json +++ b/pages.json @@ -1119,13 +1119,15 @@ "enablePullDownRefresh" : false } }, + // 目前不清楚有啥用,先注释带掉 + // { + // "path": "uni_modules/uni-portal/pages/index", + // "style": { + // "navigationBarTitleText": "发布应用", + // "enablePullDownRefresh": false + // } + // }, { - "path": "uni_modules/uni-portal/pages/index", - "style": { - "navigationBarTitleText": "发布应用", - "enablePullDownRefresh": false - } - }, { "path": "pages/potentialRisk/potentialRisk", "style": { "navigationBarTitleText": "安全隐患", diff --git a/pages/personManage/localeTeam.vue b/pages/personManage/localeTeam.vue index fdfbf6b5..a1a92b60 100644 --- a/pages/personManage/localeTeam.vue +++ b/pages/personManage/localeTeam.vue @@ -20,7 +20,7 @@ - 劳务人员分布 + 施工人员分布 diff --git a/pages/personManage/peopleAnalyze.vue b/pages/personManage/peopleAnalyze.vue index 9920cfed..ff306177 100644 --- a/pages/personManage/peopleAnalyze.vue +++ b/pages/personManage/peopleAnalyze.vue @@ -9,7 +9,7 @@ diff --git a/pages/projectEnd/laborManage/attendanceManage.vue b/pages/projectEnd/laborManage/attendanceManage.vue index c6efbd2b..2ac9e49b 100644 --- a/pages/projectEnd/laborManage/attendanceManage.vue +++ b/pages/projectEnd/laborManage/attendanceManage.vue @@ -79,7 +79,7 @@ export default { data() { return { searchForm: { - personType: 1,//1、劳务人员 2、管理人员 + personType: 1,//1、施工人员 2、管理人员 pageNo: 1, pageSize: 10, projectSn: "", @@ -92,7 +92,7 @@ export default { isLoadMore: false, personTypeArr: [ { - name: '劳务人员', value: 1 + name: '施工人员', value: 1 }, { name: '管理人员', value: 2 } diff --git a/pages/projectEnd/laborManage/index.vue b/pages/projectEnd/laborManage/index.vue index 2135508b..c93a4c4a 100644 --- a/pages/projectEnd/laborManage/index.vue +++ b/pages/projectEnd/laborManage/index.vue @@ -14,7 +14,7 @@ - 在场劳务人员 + 在场施工人员 {{statictisData.presencePerson.lwPersonTotal}} @@ -37,7 +37,7 @@ - 劳务人员出勤 + 施工人员出勤 管理人员出勤 @@ -49,7 +49,7 @@ - 劳务人员总数 + 施工人员总数 管理人员总数 @@ -63,7 +63,7 @@ - 劳务昨日出勤率 + 施工人员昨日出勤率 管理人员昨日出勤率 diff --git a/pages/projectEnd/laborManage/searchTeam/personDetail.vue b/pages/projectEnd/laborManage/searchTeam/personDetail.vue index 592728d9..fa026a87 100644 --- a/pages/projectEnd/laborManage/searchTeam/personDetail.vue +++ b/pages/projectEnd/laborManage/searchTeam/personDetail.vue @@ -355,7 +355,7 @@ let that = this; let requestData = { enterpriseName: obj.enterpriseName, - personType: obj.personType == 1?'劳务人员':obj.personType == 2?'管理人员':'临时人员', + personType: obj.personType == 1?'施工人员':obj.personType == 2?'管理人员':'临时人员', teamDepartmentName: obj.teamName || obj.departmentName, workerName: obj.workerName, projectSn: obj.projectSn diff --git a/pages/projectManage/projectManage.vue b/pages/projectManage/projectManage.vue index 4edbf71b..2b4d3d10 100644 --- a/pages/projectManage/projectManage.vue +++ b/pages/projectManage/projectManage.vue @@ -106,7 +106,7 @@ {{statisticsCount.workercount.lwPersonTotal}} - 在职劳务人员数 + 在职施工人员数 @@ -114,7 +114,7 @@ {{statisticsCount.presencecount.lwPersonTotal}} - 在场劳务人员数 + 在场施工人员数