diff --git a/dist.rar b/dist.rar deleted file mode 100644 index 5d5f9777..00000000 Binary files a/dist.rar and /dev/null differ diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js index 23c489bf..85ff1fe8 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -272,7 +272,7 @@ export const getHikvisionManualCompareApi = data => post('xmgl/xzHikvisionCompar //海康人脸评分接口 // export const checkfaceHikvisionApi = (data,token) => post('xmgl/recognition/checkfaceHikvision', data, { headers: {Authorization: token}}); -export const checkfaceHikvisionApi = data => post('xmgl/recognition/checkfaceHikvision', data); +export const checkfaceHikvisionApi = data => post('xmgl/recognition/checkFace', data); //人员管理批量删除 export const onBatchDeletionApi = data => post('xmgl/workerInfo/deleteBatch', data); diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 5a04fcc7..af77aebf 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -180,7 +180,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 - // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 @@ -201,7 +201,8 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工 // axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒 - axios.defaults.baseURL = "https://zm.zhgdyun.com:11111"; + // axios.defaults.baseURL = "https://zm.zhgdyun.com:11111"; + // axios.defaults.baseURL = "http://121.37.106.37:9809"; } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/store/index.js b/src/store/index.js index 6036a3b4..1f0ee69d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -49,6 +49,9 @@ export default new Vuex.Store({ // UPLOADURL: 'http://192.168.0.12:9809/upload/image/', // 国维科技 // FILEURL: ' http://192.168.0.12:9809/image/', // 国维科技 // WORKFLOWURL: 'http://192.168.0.12:19998/#/workspace/forms', //国维科技工作流地址 + // UPLOADURL: "http://117.146.73.156:9809/upload/image/", // 中新建项目 + // FILEURL: "http://117.146.73.156:9809/image/", //中新建项目 + // WORKFLOWURL: 'http://117.146.73.156:19998/#/workspace/forms', //中新建项目工作流地址 // UPLOADURL: "http://121.37.106.37:9809/upload/image/", // 新能源智慧基建 // FILEURL: "http://121.37.106.37:9809/image/", //新能源智慧基建 // WORKFLOWURL: 'http://121.37.106.37:19998/#/workspace/forms', //鞍钢平台工作流地址 @@ -72,8 +75,8 @@ export default new Vuex.Store({ WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // FILEURL:'http://182.90.224.237:51234/image/', - // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 - // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 + // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 + // FILEURL: "http://192.168.34.155:19111/image/", //洁本地 // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", //jiayu工作流地址(本地) diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue index 242ced44..dc551bb6 100644 --- a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue +++ b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue @@ -192,13 +192,13 @@ > {{ $t("message.laborMange.leaveEarly") }} -
+
否
+
+
+ 是否启用APP打卡 + +
?
+ +
+ + 是 + 否 + +
@@ -87,7 +104,7 @@ :rules="rules" :model="workerInfo" ref="form" - label-width="130px" + label-width="140px" size="medium" class="dialogFormBox" > @@ -100,7 +117,7 @@ :placeholder="$t('message.workType.placeholder')" > - + @@ -144,6 +162,7 @@ @@ -152,6 +171,7 @@ @@ -159,11 +179,12 @@ - @@ -176,8 +197,23 @@ :label="$t('message.workType.workInfo.isRestList')[1]" > + --> + + + + + +
+ 在上午上班时间到下午下班时间内只要有一次打卡记录即算为正常出勤1工日，没有则算0工日 +
{ - this.$refs.form.clearValidate(); - }); + onceAttendance: undefined + } + this.tempWorkerInfo = { + notLater: "", + yesLater: "", + notAdvance: "", + yesAdvance: "" + } + this.$nextTick(() => { + this.$refs.form.clearValidate(); + }); }, editBefore(worker) { this.title = "编辑考勤规则"; this.dialogVisible = true; + this.tempWorkerInfo = { + notLater: "", + yesLater: "", + notAdvance: "", + yesAdvance: "" + } this.$nextTick(() => { this.$refs.form.clearValidate(); }); @@ -449,4 +544,7 @@ export default { margin-top: 2px; } } +.dialogFormBox { + width: 460px; +} diff --git a/src/views/projectFront/laborManage/electronicFence.vue b/src/views/projectFront/laborManage/electronicFence.vue index d1581f3a..2aafb29b 100644 --- a/src/views/projectFront/laborManage/electronicFence.vue +++ b/src/views/projectFront/laborManage/electronicFence.vue @@ -183,7 +183,7 @@ v-model="needPhotoForAttend" @change="saveAttendType" > - {{$t('message.laborMange.positioningPunching')}} + {{$t('message.laborMange.positioningPunching')}}+拍照 {{$t('message.laborMange.positioningPunching')}}+{{$t('message.laborMange.faceRecognition')}} @@ -358,7 +358,8 @@ export default { ]; that.drawCircle(); } else { - alert("error"); + // alert("error"); + console.log("根据地址查询位置失败"); } }); this.map.on("click", (e) => {