diff --git a/api/request.js b/api/request.js
index 0d1310a..8ce9f82 100644
--- a/api/request.js
+++ b/api/request.js
@@ -4,7 +4,8 @@ import config from '@/config'
import { getToken } from '@/utils/auth.js'
// import store from '@/store';
-const baseUrl = config.loginBaseUrl
+// const baseUrl = config.loginBaseUrl
+const baseUrl = config.lpLoginUrl
console.log('baseUrl-请求', baseUrl)
const http = new Request({
diff --git a/config.js b/config.js
index 9ef342e..78c03af 100644
--- a/config.js
+++ b/config.js
@@ -39,56 +39,62 @@
// }
// 测试环境
module.exports = {
- // baseUrl:'/prod-api',
- // http://192.168.0.14:19999
- loginBaseUrl: 'http://112.29.103.165:1616',
- // loginBaseUrl: 'http://192.168.0.14:27018',
- // loginBaseUrl:'http://192.168.0.14:19999',
- // baseUrl:'http://192.168.0.14:2900',
- baseUrl: 'http://192.168.0.14:19999',
- // loginUrl: 'http://112.29.103.165:1616',
- login: 'http://192.168.0.14:19200',
- // 图片展示基础地址
- fileUrl: 'http://192.168.0.14:19999/exam-file/',
- // 上传文件地址
- uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64',
- bmwUrl: 'http://192.168.0.14:19999/exam-bmw',
- // 体检-基础路径
- tjBaseUrl: 'http://192.168.0.14:18077/AppPeaManager',
- // tjBaseUrl: 'http://192.168.2.91:19100/AppPeaManager',
- tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/',
+ // baseUrl:'/prod-api',
+ // http://192.168.0.14:19999
+ // loginBaseUrl: 'http://112.29.103.165:1616',
+ // // loginBaseUrl: 'http://192.168.0.14:27018',
+ // // loginBaseUrl:'http://192.168.0.14:19999',
+ // // baseUrl:'http://192.168.0.14:2900',
+ // baseUrl: 'http://192.168.0.14:19999',
+ // // loginUrl: 'http://112.29.103.165:1616',
+ // login: 'http://192.168.0.14:19200',
+ // // 图片展示基础地址
+ // fileUrl: 'http://192.168.0.14:19999/exam-file/',
+ // // 上传文件地址
+ // uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64',
+ // bmwUrl: 'http://192.168.0.14:19999/exam-bmw',
+ // // 体检-基础路径
+ // tjBaseUrl: 'http://192.168.0.14:18077/AppPeaManager',
+ // // tjBaseUrl: 'http://192.168.2.91:19100/AppPeaManager',
+ // tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/',
- //兰坪实名制移动端--登录
- lpLoginUrl:'http://192.168.0.15:9200/',
+
+ //兰坪实名制移动端--移动
+ lpAppUrl: 'http://192.168.0.50:1913/app',
+ //兰坪实名制移动端--登录
+ lpLoginUrl: 'http://192.168.0.50:9200/',
+ //兰坪实名制移动端--后台
+ lpBmwUrl: 'http://192.168.0.50:1912',
- //实名制移动端-登录接口
- realLoginUrl: 'http://192.168.0.14:1616/auth/',
- realBaseUrl: 'http://192.168.0.14:1910/',
- //实名制移动端-移动
- realAppUrl: 'http://192.168.0.14:1913/app',
- //实名制移动端-安培
- realExamUrl: 'http://192.168.0.14:1616/system',
- //实名制移动端-文件
- realFileUrl: 'http://192.168.0.14:1909/file/',
- //实名制移动端
- realBmwUrl: 'http://192.168.0.14:1616/bmw',
- //实名制移动端 -- 新
- realNewBmwUrl: 'http://192.168.0.14:1616',
- loginUrl: 'http://192.168.0.14:27018',
- //实名制移动端 -- 新
- realNewYnUrl: 'http://192.168.0.14:1918',
- realIdCardUrl: 'http://192.168.0.14:26699',
- //作业计划 -- 新
- workPlanNewYnUrl: 'http://192.168.0.14:19191',
+ // //实名制移动端-登录接口
+ // realLoginUrl: 'http://192.168.0.14:1616/auth/',
+ // realBaseUrl: 'http://192.168.0.14:1910/',
+ // //实名制移动端-移动
+ // realAppUrl: 'http://192.168.0.14:1913/app',
+ // //实名制移动端-安培
+ // realExamUrl: 'http://192.168.0.14:1616/system',
+ // //实名制移动端-文件
+ // realFileUrl: 'http://192.168.0.14:1909/file/',
+ // //实名制移动端
+ // realBmwUrl: 'http://192.168.0.14:1616/bmw',
+ // //实名制移动端 -- 新
+ // realNewBmwUrl: 'http://192.168.0.14:1616',
+ // loginUrl: 'http://192.168.0.14:27018',
+ // //实名制移动端 -- 新
+ // realNewYnUrl: 'http://192.168.0.14:1918',
+ // realIdCardUrl: 'http://192.168.0.14:26699',
- // 应用信息
- appInfo: {
- // 应用名称
- name: '作业管控智慧平台',
- // 应用版本
- version: '1.1.0'
- }
-}
+ // //作业计划 -- 新
+ // workPlanNewYnUrl: 'http://192.168.0.14:19191',
+
+ // 应用信息
+ appInfo: {
+ // 应用名称
+ name: '作业管控智慧平台',
+ // 应用版本
+ version: '1.1.0'
+ }
+}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b8a75e1..4297479 100644
--- a/manifest.json
+++ b/manifest.json
@@ -136,7 +136,7 @@
}
},
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"quickapp" : {},
@@ -168,19 +168,19 @@
}
},
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"mp-alipay" : {
"usingComponents" : true,
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"mp-baidu" : {
"usingComponents" : true,
"uniStatistics" : {
- "enable" : true
+ "enable" : false
},
"dynamicLib" : {
"editorLib" : {
@@ -191,13 +191,13 @@
"mp-toutiao" : {
"usingComponents" : true,
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"mp-jd" : {
"usingComponents" : true,
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"h5" : {
@@ -217,37 +217,47 @@
"timeout" : 20000
},
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"vueVersion" : "2",
"mp-kuaishou" : {
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"mp-lark" : {
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"mp-qq" : {
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"quickapp-webview-huawei" : {
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"quickapp-webview-union" : {
"uniStatistics" : {
- "enable" : true
+ "enable" : false
}
},
"uniStatistics" : {
"version" : "2",
- "enable" : true
+ "enable" : false
+ },
+ "app-harmony" : {
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "mp-harmony" : {
+ "uniStatistics" : {
+ "enable" : false
+ }
}
}
diff --git a/pages.json b/pages.json
index 001625a..cc78a3f 100644
--- a/pages.json
+++ b/pages.json
@@ -611,6 +611,14 @@
}
},
+ {
+ //欠薪维权申诉-首页
+ "path": "pages/realName/workbench/safeguarding/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+
{
//人员暂退-暂退人员选择
"path": "pages/realName/workbench/outPerson/outList",
diff --git a/pages/login.vue b/pages/login.vue
index 84be17c..fc91ac2 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -240,7 +240,6 @@ export default {
}
}
return {
- // globalConfig: getApp().globalData.config,
selectTab: 1,
loginForm: {
phone: '14769014289', // 18955734761 18700000001 17681010134 15955147005 15656751631
diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue
index 7732957..b751882 100644
--- a/pages/realName/index/index.vue
+++ b/pages/realName/index/index.vue
@@ -1,1277 +1,1429 @@
-
-
-
- 刷新
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 刷新
+
+
+
+
+
+
+
+
+
+ 今日考勤:{{ attPersonNum }}
+ 固定人员:{{ einFormalAttPersonNum }}
+ 临时人员:{{ einTemporaryAttPersonNum }}
+
+
+
+
+ 在场考勤率:{{
+ isNaN(((attPersonNum / einPersonNum) * 100).toFixed(2))
+ ? 0
+ : ((attPersonNum / einPersonNum) * 100).toFixed(2)
+ }}%
+
+
+ 计划考勤率:{{
+ isNaN(((planAttNum / planPersonNum) * 100).toFixed(2))
+ ? 0
+ : ((planAttNum / planPersonNum) * 100).toFixed(2)
+ }}%
+
+ 计划考勤率:20%
+
+
+
+
+
+
+ 今日风险
+
+
+ 高风险:{{ highRiskNum }}
+ 中风险:{{ mediumRiskNum }}
+ 低风险:{{ lowRiskNum }}
+ 计划作业人数:{{ planPersonNum }}
+
+
+
+
+
+
+ 在场人数:{{ einPersonNum }}
+ 固定人数:{{ formalPersonNum }}
+ 临时人数:{{ temporaryPersonNum }}
+
+
+
+ 绿灯人数:{{ greenNum }}
+ 黄灯人数:{{ yellowNum }}
+ 红灯人数:{{ redNum }}
+
+
+
+
+
+ 项目信息
+
+
+ 在建工程:{{ buildProNum }}
+ 投入分包:{{ subNum }}
+ 在用班组:{{ teamNum }}
+ 在场人员:{{ einPersonNum }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+ -->
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 数据概览
+
+
+
+
+ {{ item.data_num }}
+ {{ item.data_title }}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 人员考勤率
+
+
+
+ {{ item.progress_title }}
+
+ {{ isNaN(item.progress_proportion) ? 0 : item.progress_proportion }}%
+
+
+
+
+
+
+ {{ item.progress_ready }}/{{ item.progress_amount }}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 工程概况
+
+
+
+ {{ item.project_title }}
+ {{ item.project_num }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 在场人员概况
+
+
+
+
+ {{
+ isNaN(((greenNum / colorAmount) * 100).toFixed(2)) ? 0 : ((greenNum / colorAmount) * 100).toFixed(2)
+ }}%
+
+ {{ greenNum }}
+
+
+
+
+ {{
+ isNaN(((yellowNum / colorAmount) * 100).toFixed(2)) ? 0 : ((yellowNum / colorAmount) * 100).toFixed(2)
+ }}%
+
+ {{ yellowNum }}
+
+
+
+
+ {{ isNaN(((redNum / colorAmount) * 100).toFixed(2)) ? 0 : ((redNum / colorAmount) * 100).toFixed(2) }}%
+
+ {{ redNum }}
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ isNaN(((maleNum / sexAmount) * 100).toFixed(2)) ? 0 : ((maleNum / sexAmount) * 100).toFixed(2) }}%
+
+ 男({{ maleNum }})
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+ {{
+ isNaN(((femaleNum / sexAmount) * 100).toFixed(2)) ? 0 : ((femaleNum / sexAmount) * 100).toFixed(2)
+ }}%
+
+ 女({{ femaleNum }})
+
+
+
-
+ 固定、临时人员
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ formalPersonNum }}
+
+
+
+ {{ temporaryPersonNum }}
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 固定占比{{
+ isNaN(((formalPersonNum / (formalPersonNum + temporaryPersonNum)) * 100).toFixed(2))
+ ? 0
+ : ((formalPersonNum / (formalPersonNum + temporaryPersonNum)) * 100).toFixed(2)
+ }}%
+
+
+ 流动占比
+ {{
+ isNaN(((temporaryPersonNum / (formalPersonNum + temporaryPersonNum)) * 100).toFixed(2))
+ ? 0
+ : ((temporaryPersonNum / (formalPersonNum + temporaryPersonNum)) * 100).toFixed(2)
+ }}%
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 选择工程
+
+
+
+
+
+ {{ item.abbreviation }}
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+ .data-overview-img {
+ width: 100rpx;
+ height: 100rpx;
+ }
+
+ .data-overview-item {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: flex-start;
+ font-size: 24rpx;
+ font-weight: bold;
+ }
+ }
+ }
+ }
+
+ // 人员考勤率
+ .check-work-attendance {
+ .check-work-attendance-container {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+
+ view {
+ width: calc(50% - 40rpx);
+ padding: 0 10rpx;
+ margin-bottom: 15rpx;
+
+ .top-title,
+ .bottom-progress {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .progress-box {
+ flex: 1;
+ margin-right: 15rpx;
+ }
+ }
+
+ .top-title text:last-child {
+ font-weight: bold;
+ }
+ }
+ }
+ }
+
+ // 工程概况
+ .project-container {
+ .project-content {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+
+ view {
+ width: calc(50% - 40rpx);
+ padding: 0 10rpx;
+ margin-bottom: 15rpx;
+
+ .top-title,
+ .bottom-progress {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .progress-box {
+ flex: 1;
+ margin-right: 15rpx;
+ }
+ }
+
+ .top-title text:last-child {
+ font-weight: bold;
+ }
+ }
+ }
+ }
+
+ .charts_container {
+ width: 100%;
+ height: 460rpx;
+ }
+
+ // 在场人员概况
+ .person-container .person-content {
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+
+ .person-img {
+ width: 160rpx;
+ height: 160rpx;
+ }
+
+ view {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ }
+
+ .text-strong {
+ font-size: 24rpx;
+ font-weight: bold;
+ }
+ }
+
+ .gender-content {
+ display: flex;
+
+ .man-left,
+ .girl-right {
+ width: 50%;
+ height: 300rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .gender-img {
+ width: 160rpx;
+ height: 240rpx;
+ // background-color: orange;
+ }
+ }
+ }
+
+ h5 {
+ font-weight: normal;
+ margin: 30rpx 0 15rpx;
+ text-align: center;
+ letter-spacing: 2rpx;
+ font-size: 28rpx;
+ }
+
+ .person-num {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 40rpx;
+
+ image {
+ vertical-align: middle;
+ }
+ }
+
+ .person-num-progress {
+ padding: 0 15rpx;
+ margin: 20rpx 0;
+ }
+
+ .person-proportion {
+ margin: 15rpx 0;
+ padding: 0 25rpx;
+ display: flex;
+ align-content: center;
+ justify-content: space-between;
+ }
+ }
+
+ .charts-box {
+ width: 70%;
+ height: 460rpx;
+ margin: 0 auto;
+ }
+
+ .gender-img {
+ border-radius: 18rpx;
+ }
+
+ .demo {
+ width: 100%;
+ height: 500rpx;
+ background-color: orange;
+ }
+
+ .rules-popup {
+ width: 600rpx;
+ padding: 30rpx;
+ background-color: #fff;
+ }
+
+ .rules-title {
+ text-align: center;
+ font-size: 32rpx;
+ font-weight: bold;
+ margin-bottom: 20rpx;
+ }
+
+ .rules-content {
+ max-height: 700rpx;
+ }
+
+ .rule-item {
+ padding: 15rpx 0;
+ font-size: 28rpx;
+ line-height: 1.5;
+ border-bottom: 1px solid #eee;
+ }
+
+ .countdown {
+ text-align: center;
+ margin-top: 20rpx;
+ font-size: 28rpx;
+ color: #666;
+ }
+
+ .close-btn {
+ margin-top: 30rpx;
+ background-color: #3498db;
+ color: #fff;
+ padding: 20rpx;
+ border-radius: 8rpx;
+ }
+
+ .close-btn:disabled {
+ background-color: #ccc;
+ }
+
\ No newline at end of file
diff --git a/pages/realName/index/pages/personList.vue b/pages/realName/index/pages/personList.vue
index 35d06fc..7ac7554 100644
--- a/pages/realName/index/pages/personList.vue
+++ b/pages/realName/index/pages/personList.vue
@@ -497,7 +497,7 @@ export default {
console.log(this.queryParams)
this.isLoading = true
uni.request({
- url: config.realBmwUrl + '/homeSubPage/getAppWorkerMsg',
+ url: config.lpBmwUrl + '/bmw/homeSubPage/getAppWorkerMsg',
method: 'POST',
data: JSON.stringify(this.queryParams),
header: {
diff --git a/pages/realName/index/pages/project.vue b/pages/realName/index/pages/project.vue
index a124df6..751f41d 100644
--- a/pages/realName/index/pages/project.vue
+++ b/pages/realName/index/pages/project.vue
@@ -317,7 +317,7 @@ export default {
console.log('this.queryParams参数', this.queryParams)
this.isLoading = true
uni.request({
- url: config.realBmwUrl + '/homeSubPage/getAppBuildPro',
+ url: config.lpBmwUrl + '/bmw/homeSubPage/getAppBuildPro',
method: 'POST',
data: JSON.stringify(this.queryParams),
header: {
diff --git a/pages/realName/index/pages/subList.vue b/pages/realName/index/pages/subList.vue
index 3dc0f17..0ff3ead 100644
--- a/pages/realName/index/pages/subList.vue
+++ b/pages/realName/index/pages/subList.vue
@@ -296,7 +296,7 @@ export default {
console.log(this.queryParams)
this.isLoading=true
uni.request({
- url: config.realBmwUrl + '/homeSubPage/getAppActiveSub',
+ url: config.lpBmwUrl + '/bmw/homeSubPage/getAppActiveSub',
method: 'POST',
data: JSON.stringify(this.queryParams),
header: {
diff --git a/pages/realName/index/pages/teamList.vue b/pages/realName/index/pages/teamList.vue
index 355e54b..2eeb6ce 100644
--- a/pages/realName/index/pages/teamList.vue
+++ b/pages/realName/index/pages/teamList.vue
@@ -205,7 +205,7 @@ export default {
console.log('this.queryParams参数', this.queryParams)
this.isLoading=true
uni.request({
- url: config.realBmwUrl + '/homeSubPage/getAppActiveTeam',
+ url: config.lpBmwUrl + '/bmw/homeSubPage/getAppActiveTeam',
method: 'POST',
data: JSON.stringify(this.queryParams),
header: {
diff --git a/pages/realName/workbench/electronicContractSign/index.vue b/pages/realName/workbench/electronicContractSign/index.vue
index 5f3ce61..b249fe7 100644
--- a/pages/realName/workbench/electronicContractSign/index.vue
+++ b/pages/realName/workbench/electronicContractSign/index.vue
@@ -204,7 +204,7 @@ export default {
subId:-1
}
uni.request({
- url: config.realAppUrl + '/offLine/getPro',
+ url: config.lpAppUrl + '/offLine/getPro',
method: 'post',
data: param,
header: {
@@ -230,7 +230,7 @@ export default {
proId:-1
}
uni.request({
- url: config.realAppUrl + '/offLine/getSubcontractor',
+ url: config.lpAppUrl + '/offLine/getSubcontractor',
method: 'post',
data: param,
header: {
@@ -272,7 +272,7 @@ export default {
console.log(param)
this.listData=[]
uni.request({
- url: config.realAppUrl+'/contract/contractSignQueryList',
+ url: config.lpAppUrl+'/contract/contractSignQueryList',
method: 'post',
data: param,
header: {
@@ -379,7 +379,7 @@ export default {
}
console.log(param)
await uni.request({
- url: config.realAppUrl+'/contract/updateSign',
+ url: config.lpAppUrl+'/contract/updateSign',
method: 'post',
data: param,
header: {
diff --git a/pages/realName/workbench/index.vue b/pages/realName/workbench/index.vue
index 11d6d82..8fe2313 100644
--- a/pages/realName/workbench/index.vue
+++ b/pages/realName/workbench/index.vue
@@ -1,459 +1,527 @@
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- 我的组织
-
-
-
-
- 作业计划管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 选择工程
-
-
-
- {{item.abbreviation}}
-
-
-
-
-
-
-
-
-
- 个人信息查询
-
-
-
-
- 人脸照片
- 已采集
-
-
- 人脸照片
- 未采集
-
-
-
- 电子签名
- 已采集
-
-
- 电子签名
- 未采集
-
-
-
- 合同见证/电子合同
- 已上传
-
-
- 合同见证/电子合同
- 未上传
-
-
-
- 工资卡见证
- 已上传
-
-
- 工资卡见证
- 未上传
-
-
-
- 班组作业点
- 已配置
-
-
- 班组作业点
- 未配置
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 我的组织
+
+
+
+
+
+
+ 作业计划管理
+
+
+
+
+
+
+ 欠薪维权申诉
+
+
+
+
+
+
+
+ 人员信息录入
+
+
+
+
+
+
+
+ 电子合同签署
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择工程
+
+
+
+ {{item.abbreviation}}
+
+
+
+
+
+
+
+
+
+
+ 个人信息查询
+
+
+
+
+ 人脸照片
+ 已采集
+
+
+ 人脸照片
+ 未采集
+
+
+
+ 电子签名
+ 已采集
+
+
+ 电子签名
+ 未采集
+
+
+
+ 合同见证/电子合同
+ 已上传
+
+
+ 合同见证/电子合同
+ 未上传
+
+
+
+ 工资卡见证
+ 已上传
+
+
+ 工资卡见证
+ 未上传
+
+
+
+ 班组作业点
+ 已配置
+
+
+ 班组作业点
+ 未配置
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
\ No newline at end of file
+ .page {
+ width: 100%;
+ height: 100vh;
+
+ // box-sizing: border-box;
+ // padding: 15vh 8vw;
+ .view-box {
+ width: 100%;
+ height: auto;
+ display: flex;
+ flex-wrap: wrap;
+ flex-direction: row;
+ margin-bottom: 100rpx;
+ }
+
+ .view-item {
+ width: 33%;
+ height: 200rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ }
+
+ // .view-item{
+ // width: 94%;
+ // margin: 0rpx auto;
+ // padding:20rpx;
+ // // display: flex;
+ // border-bottom: 1rpx solid #EFEFEF;
+ // font-size: 26rpx;
+ // .label{
+ // width: 300rpx;
+ // color: #666;
+ // margin-bottom: 20rpx;
+ // }
+ // }
+ .card-item {
+ width: 90%;
+ margin: 20rpx auto;
+ padding: 16rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 26rpx;
+ background: #E2F0CD;
+ border-radius: 10rpx;
+
+ .label {
+ width: 300rpx;
+ color: #74B01A;
+ font-weight: 600;
+ // margin-bottom: 20rpx;
+ }
+
+ .btn {
+ width: 140rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ color: #FFF;
+ background: #6FB504;
+ text-align: center;
+ border-radius: 10rpx;
+ }
+ }
+
+ .card-item-red {
+ width: 90%;
+ margin: 20rpx auto;
+ padding: 16rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 26rpx;
+ background: #FFEBEC;
+ border-radius: 10rpx;
+
+ .label {
+ width: 300rpx;
+ color: #DA3E26;
+ font-weight: 600;
+ // margin-bottom: 20rpx;
+ }
+
+ .btn {
+ width: 140rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ color: #FFF;
+ background: #FF2F2F;
+ text-align: center;
+ border-radius: 10rpx;
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/realName/workbench/personEnter/addPeople.vue b/pages/realName/workbench/personEnter/addPeople.vue
index 12b3c2b..27be392 100644
--- a/pages/realName/workbench/personEnter/addPeople.vue
+++ b/pages/realName/workbench/personEnter/addPeople.vue
@@ -32,6 +32,7 @@
+
@@ -866,7 +867,7 @@ export default {
}
console.log(param)
uni.request({
- url: config.realAppUrl + '/offLine/getPro',
+ url: config.lpAppUrl + '/offLine/getPro',
method: 'post',
data: param,
header: {
@@ -922,7 +923,7 @@ export default {
//获取工种
getpostList(){
uni.request({
- url: config.realAppUrl + '/offLine/getWorkType',
+ url: config.lpAppUrl + '/offLine/getWorkType',
method: 'post',
data: {},
header: {
@@ -1425,7 +1426,7 @@ export default {
}
console.log(param)
uni.request({
- url: config.realAppUrl+'/entry/addEntryPerson',
+ url: config.lpAppUrl+'/entry/addEntryPerson',
method: 'post',
data: param,
header: {
diff --git a/pages/realName/workbench/personEnter/editPeople.vue b/pages/realName/workbench/personEnter/editPeople.vue
index ba9fd5f..410e898 100644
--- a/pages/realName/workbench/personEnter/editPeople.vue
+++ b/pages/realName/workbench/personEnter/editPeople.vue
@@ -871,7 +871,7 @@ export default {
}
console.log(param)
uni.request({
- url: config.realAppUrl + '/offLine/getPro',
+ url: config.lpAppUrl + '/offLine/getPro',
method: 'post',
data: param,
header: {
@@ -927,7 +927,7 @@ export default {
//获取工种
getpostList(){
uni.request({
- url: config.realAppUrl + '/offLine/getWorkType',
+ url: config.lpAppUrl + '/offLine/getWorkType',
method: 'post',
data: {},
header: {
@@ -1037,7 +1037,7 @@ export default {
//获取人员信息
getPersonById(){
uni.request({
- url: config.realAppUrl+'/entry/'+this.idNumber,
+ url: config.lpAppUrl+'/entry/'+this.idNumber,
method: 'get',
data: {},
header: {
@@ -1450,7 +1450,7 @@ export default {
}
console.log(param)
uni.request({
- url: config.realAppUrl+'/entry/updateEntryPerson',
+ url: config.lpAppUrl+'/entry/updateEntryPerson',
method: 'post',
data: param,
header: {
diff --git a/pages/realName/workbench/personEnter/facePeople.vue b/pages/realName/workbench/personEnter/facePeople.vue
index c956e0e..e5d57d3 100644
--- a/pages/realName/workbench/personEnter/facePeople.vue
+++ b/pages/realName/workbench/personEnter/facePeople.vue
@@ -928,7 +928,7 @@ export default {
}
console.log(param)
uni.request({
- url: config.realAppUrl + '/offLine/getPro',
+ url: config.lpAppUrl + '/offLine/getPro',
method: 'post',
data: param,
header: {
@@ -985,7 +985,7 @@ export default {
//获取工种
getpostList(){
uni.request({
- url: config.realAppUrl + '/offLine/getWorkType',
+ url: config.lpAppUrl + '/offLine/getWorkType',
method: 'post',
data: {},
header: {
@@ -1095,7 +1095,7 @@ export default {
//获取人员信息
getPersonById(){
uni.request({
- url: config.realAppUrl+'/entry/'+this.idNumber,
+ url: config.lpAppUrl+'/entry/'+this.idNumber,
method: 'get',
data: {},
header: {
@@ -1509,7 +1509,7 @@ export default {
}
console.log(param)
uni.request({
- url: config.realAppUrl+'/entry/updateEntryPerson',
+ url: config.lpAppUrl+'/entry/updateEntryPerson',
method: 'post',
data: param,
header: {
diff --git a/pages/realName/workbench/personEnter/searchPeople.vue b/pages/realName/workbench/personEnter/searchPeople.vue
index cc56481..d652075 100644
--- a/pages/realName/workbench/personEnter/searchPeople.vue
+++ b/pages/realName/workbench/personEnter/searchPeople.vue
@@ -75,7 +75,7 @@ export default {
}
this.isLoading=true
uni.request({
- url: config.realAppUrl+'/BasePerson/downloadWorkPersonQualifications',
+ url: config.lpAppUrl+'/BasePerson/downloadWorkPersonQualifications',
method: 'post',
data: param,
header: {
diff --git a/pages/realName/workbench/safeguarding/detail.vue b/pages/realName/workbench/safeguarding/detail.vue
index e877515..7e6f6e8 100644
--- a/pages/realName/workbench/safeguarding/detail.vue
+++ b/pages/realName/workbench/safeguarding/detail.vue
@@ -119,7 +119,7 @@ export default {
id:this.id,
}
uni.request({
- url: config.realAppUrl+'/safeguardingInfo/getSafeguardingInfoById',
+ url: config.lpAppUrl+'/safeguardingInfo/getSafeguardingInfoById',
method: 'post',
data: param,
header: {
@@ -148,7 +148,7 @@ export default {
id:this.id,
}
uni.request({
- url: config.realAppUrl+'/safeguardingInfo/getSafeguardingPhotoById',
+ url: config.lpAppUrl+'/safeguardingInfo/getSafeguardingPhotoById',
method: 'post',
data: param,
header: {
diff --git a/pages/realName/workbench/safeguarding/index.vue b/pages/realName/workbench/safeguarding/index.vue
index 4679051..48b2a7b 100644
--- a/pages/realName/workbench/safeguarding/index.vue
+++ b/pages/realName/workbench/safeguarding/index.vue
@@ -1,791 +1,836 @@
-
-
-
-
- 填写申述
-
-
-
- 申诉回复结果
-
-
-
-
-
-
-
- 基本信息
+
+
+
+
+
+
+
+ 基本信息
-
-
- 考勤记录 *
-
-
-
+
+
+
+ 欠薪单位 *
+
+
+
+
-
-
+
+
+ 欠薪项目 *
+
+
+
+
+
+
+ 欠薪金额 *
+
+
+
+
+
+
+
+ 单位地址 *
+
+
+
+
+
+
+
+ 申请人姓名 *
+
+
+
+
+
+
+
+ 身份证号码 *
+
+
+
+
+
+
+
+ 电话号码 *
+
+
+
+
+
+
+
+
+ 欠薪时间 *
-
-
- 工资信息 *
-
-
-
-
-
-
-
+
+
-
-
- 其他依据
-
-
-
-
-
-
-
+
+
+ 有效依据
-
-
-
- 确 定
-
-
-
-
-
-
- 暂无数据
-
-
-
-
-
-
- 姓名:
- {{item.applayUser}}
-
-
- 身份证号:
- {{item.idCard}}
-
-
- 申诉上传时间:
- {{item.representationTime}}
-
-
- 申诉回复结果:
- {{item.replyContent}}
-
-
+
+ 合同照片 *
+
+
+
+
+
+
-
-
-
-
-
+
+
+ 考勤记录 *
+
+
+
+
+
+
+
+
+
+
+ 工资信息 *
+
+
+
+
+
+
+
+
+
+
+ 其他依据
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+ 姓名:
+ {{item.applayUser}}
+
+
+ 身份证号:
+ {{item.idCard}}
+
+
+ 申诉上传时间:
+ {{item.representationTime}}
+
+
+ 申诉回复结果:
+ {{item.replyContent}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 2ae5c19..49fd1c2 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,8 +5,9 @@ import errorCode from '@/utils/errorCode'
import { toast, showConfirm, tansParams } from '@/utils/common'
let timeout = 60000
-const baseUrl = config.loginBaseUrl
+// const baseUrl = config.loginBaseUrl
// const baseUrl = config.loginUrl
+const baseUrl = config.lpLoginUrl
console.log('baseUrl-请求', baseUrl)
const request = config => {
diff --git a/utils/request_new.js b/utils/request_new.js
index 6e1eb29..8dfcee3 100644
--- a/utils/request_new.js
+++ b/utils/request_new.js
@@ -5,7 +5,8 @@ import errorCode from '@/utils/errorCode'
import { toast, showConfirm, tansParams } from '@/utils/common'
let timeout = 60000
-const baseUrl = config.realNewBmwUrl
+// const baseUrl = config.realNewBmwUrl
+const baseUrl = config.lpBmwUrl
console.log('baseUrl-请求', baseUrl)
const request = config => {
@@ -43,8 +44,8 @@ const request = config => {
// console.log(response)
let [error, res] = response
if (error) {
- toast('后端接口连接异常')
- reject('后端接口连接异常')
+ toast('request_new后端接口连接异常')
+ reject('request_new后端接口连接异常')
return
}
const code = res.data.code || 200
diff --git a/utils/request_new_yn.js b/utils/request_new_yn.js
index 83896f1..d9758c1 100644
--- a/utils/request_new_yn.js
+++ b/utils/request_new_yn.js
@@ -4,11 +4,11 @@ import { getToken, setToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { toast, showConfirm, tansParams } from '@/utils/common'
-const token = uni.getStorageSync('wkToken') || null
+const token = uni.getStorageSync('realNameToken') || null
let timeout = 60000
const baseUrl = config.workPlanNewYnUrl
-console.log('token', token)
+// console.log('token', token)
let isRequesting = false // 请求锁,防止重复请求
diff --git a/utils/request_new_yn_home.js b/utils/request_new_yn_home.js
index 202e8dc..6a34529 100644
--- a/utils/request_new_yn_home.js
+++ b/utils/request_new_yn_home.js
@@ -4,11 +4,11 @@ import { getToken, setToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { toast, showConfirm, tansParams } from '@/utils/common'
-const token = uni.getStorageSync('wkToken') || null
+const token = uni.getStorageSync('realNameToken') || null
let timeout = 60000
const baseUrl = config.realNewYnUrl
-console.log('token', token)
+// console.log('token', token)
const request = config => {
// 是否需要设置 token