diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue index 238c0da..e6d081c 100644 --- a/hb_client/src/components/customForm/index.vue +++ b/hb_client/src/components/customForm/index.vue @@ -245,7 +245,7 @@ that.img = new Image(); that.img.crossOrigin = 'anonymous'; let value = imag[0].field_value?imag[0].field_value:imag[0].draw_template; - that.img = 'http://49.232.14.174:2222'+value; + that.img = value; setTimeout(function(){ that.canvasInit(); },500); diff --git a/hb_client/src/components/customForm/review.vue b/hb_client/src/components/customForm/review.vue index 8fa0c79..4265772 100644 --- a/hb_client/src/components/customForm/review.vue +++ b/hb_client/src/components/customForm/review.vue @@ -217,10 +217,10 @@
- +
- + 您的浏览器不支持绘图,请升级或更换浏览器! @@ -329,8 +329,8 @@ }); that.img = new Image(); that.img.crossOrigin = ''; - that.img = 'http://49.232.14.174:2222'+imag[0].field_value; - that.originImg = 'http://49.232.14.174:2222'+imag[0].origin_value; + that.img = imag[0].field_value; + that.originImg = imag[0].origin_value; listJudge.forEach(item => { let obj = new Object(); obj = item; diff --git a/hb_client/src/views/inm/fifodetail.vue b/hb_client/src/views/inm/fifodetail.vue index ee67ebc..cd0d640 100644 --- a/hb_client/src/views/inm/fifodetail.vue +++ b/hb_client/src/views/inm/fifodetail.vue @@ -462,7 +462,7 @@
{{item.field_name}}: - +
diff --git a/hb_client/src/views/pm/plandetails.vue b/hb_client/src/views/pm/plandetails.vue index c41a538..e1ae11a 100644 --- a/hb_client/src/views/pm/plandetails.vue +++ b/hb_client/src/views/pm/plandetails.vue @@ -106,7 +106,7 @@
{{item.field_name}}: - +
diff --git a/hb_client/src/views/qm/producttest.vue b/hb_client/src/views/qm/producttest.vue index 9585dd4..ab55b26 100644 --- a/hb_client/src/views/qm/producttest.vue +++ b/hb_client/src/views/qm/producttest.vue @@ -146,7 +146,7 @@
{{item.field_name}}: - +
diff --git a/hb_client/src/views/qm/taskrecordfrom.vue b/hb_client/src/views/qm/taskrecordfrom.vue index 9b9c359..ebedb8a 100644 --- a/hb_client/src/views/qm/taskrecordfrom.vue +++ b/hb_client/src/views/qm/taskrecordfrom.vue @@ -79,7 +79,7 @@
{{item.field_name}}: - +
diff --git a/hb_client/src/views/qm/unproduct.vue b/hb_client/src/views/qm/unproduct.vue index 0037a2f..fbb3e36 100644 --- a/hb_client/src/views/qm/unproduct.vue +++ b/hb_client/src/views/qm/unproduct.vue @@ -275,7 +275,7 @@
{{item.field_name}}: - +
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue index b844f4e..7bf8169 100644 --- a/hb_client/src/views/wpm/need.vue +++ b/hb_client/src/views/wpm/need.vue @@ -476,7 +476,7 @@
{{item.field_name}}: - +
导出 @@ -946,7 +946,7 @@ debugger; console.log(res.data.path) let link = document.createElement('a'); - link.href = 'http://49.232.14.174:2222'+res.data.path; + link.href = res.data.path; document.body.appendChild(link); link.click(); } diff --git a/hb_server/apps/hrm/serializers.py b/hb_server/apps/hrm/serializers.py index 8369da8..e6999f2 100644 --- a/hb_server/apps/hrm/serializers.py +++ b/hb_server/apps/hrm/serializers.py @@ -20,15 +20,15 @@ class EmployeeNotWorkRemarkSerializer(ModelSerializer): fields = ['not_work_remark'] class FaceLoginSerializer(serializers.Serializer): base64 = serializers.CharField() - tolerance = serializers.FloatField(required=False, default=0.42) + tolerance = serializers.FloatField(required=False, default=0.38) class FaceLoginPathSerializer(serializers.Serializer): path = serializers.CharField() - tolerance = serializers.FloatField(required=False, default=0.42) + tolerance = serializers.FloatField(required=False, default=0.38) class FaceClockCreateSerializer(serializers.Serializer): base64 = serializers.CharField() - tolerance = serializers.FloatField(required=False, default=0.42) + tolerance = serializers.FloatField(required=False, default=0.38) class ClockRecordListSerializer(serializers.ModelSerializer): create_by_ = UserSimpleSerializer(source='create_by', read_only=True) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index a75f1bf..8b220e8 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -10,7 +10,7 @@ from django.core.cache import cache class HRMService: @classmethod - def face_compare_from_path(cls, path, tolerance=0.42): + def face_compare_from_path(cls, path, tolerance=0.38): filepath = settings.BASE_DIR +path try: unknown_picture = face_recognition.load_image_file(filepath) @@ -43,7 +43,7 @@ class HRMService: return None, '匹配多张人脸:' + user_name_str @classmethod - def face_compare_from_base64(cls, base64_data, tolerance=0.42): + def face_compare_from_base64(cls, base64_data, tolerance=0.38): filename = str(uuid.uuid4()) filepath = settings.BASE_DIR +'/temp/' + filename +'.png' with open(filepath, 'wb') as f: diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py index 7f132e8..2fa4eec 100644 --- a/hb_server/apps/hrm/views.py +++ b/hb_server/apps/hrm/views.py @@ -109,7 +109,7 @@ class ClockRecordViewSet(CreateModelMixin, ListModelMixin, GenericViewSet): if 8<=now_local.hour<=17: base64_data = base64.urlsafe_b64decode(tran64( request.data.get('base64').replace(' ', '+'))) - user, msg = HRMService.face_compare_from_base64(base64_data, request.data.get('tolerance', 0.42)) + user, msg = HRMService.face_compare_from_base64(base64_data, request.data.get('tolerance', 0.38)) if user: ins, created = ClockRecord.objects.get_or_create( create_by = user, create_time__hour__range = [8,18], @@ -160,7 +160,7 @@ class FaceLogin(CreateAPIView): 人脸识别登录 """ base64_data = base64.urlsafe_b64decode(tran64(request.data.get('base64').replace(' ', '+'))) - user, msg = HRMService.face_compare_from_base64(base64_data, request.data.get('tolerance', 0.42)) + user, msg = HRMService.face_compare_from_base64(base64_data, request.data.get('tolerance', 0.38)) if user: refresh = RefreshToken.for_user(user) # 可设为在岗 @@ -198,7 +198,7 @@ class FacePathLogin(CreateAPIView): """ 人脸识别登录-文件地址 """ - user, msg = HRMService.face_compare_from_path(request.data.get('path'), request.data.get('tolerance', 0.42)) + user, msg = HRMService.face_compare_from_path(request.data.get('path'), request.data.get('tolerance', 0.38)) if user: refresh = RefreshToken.for_user(user) # 可设为在岗 diff --git a/hb_server/apps/qm/export.py b/hb_server/apps/qm/export.py index 127a2ba..c107e7c 100644 --- a/hb_server/apps/qm/export.py +++ b/hb_server/apps/qm/export.py @@ -28,9 +28,10 @@ def exprot_test_record(tr:TestRecord, tm:str): 'l': InlineImage(doc, BASE_DIR + i['field_value'], width=Mm(80)), } else: - edata[i['field_key']] = i['field_value'] - if i.get('origin_value', ''): - edata[i['field_key']] = '{}({})'.format(i['origin_value'] + i['field_value']) + if i['field_value']: + edata[i['field_key']] = i['field_value'] + elif i.get('origin_value', ''): + edata[i['field_key']] = i['origin_value'] # 开始生成word doc.render(edata)