- (如无合适照片请该人员登陆秦安APP中进行人脸照片采集)
+ (如无合适照片请该人员登陆交运安全APP中进行人脸照片采集)
diff --git a/src/views/enterprise_management/user_practitioner/add.vue b/src/views/enterprise_management/user_practitioner/add.vue
index 4dcbcde..e244f2f 100644
--- a/src/views/enterprise_management/user_practitioner/add.vue
+++ b/src/views/enterprise_management/user_practitioner/add.vue
@@ -667,7 +667,7 @@
图像分辨率:大于32×32像素,小于4096×4096像素,人脸占比不低于64×64像素。
- (如无合适照片请该人员登陆秦安APP中进行人脸照片采集)
+ (如无合适照片请该人员登陆交运安全APP中进行人脸照片采集)
@@ -1293,7 +1293,11 @@ const fnSubmit = debounce(
ElMessage.error("已超过可创建用户数量");
return;
}
- await setPractitionerAdd(formData);
+ const result = await setPractitionerAdd(formData);
+ if (result.msg === "errorFace") {
+ ElMessage.warning("人脸图像不符合要求,请重新上传");
+ return;
+ }
} else {
if (
data.oldDepartId !== data.form.DEPARTMENT_ID ||
diff --git a/src/views/enterprise_management/user_practitioner/choiceadd.vue b/src/views/enterprise_management/user_practitioner/choiceadd.vue
index 922e322..94d9388 100644
--- a/src/views/enterprise_management/user_practitioner/choiceadd.vue
+++ b/src/views/enterprise_management/user_practitioner/choiceadd.vue
@@ -696,7 +696,7 @@
图像分辨率:大于32×32像素,小于4096×4096像素,人脸占比不低于64×64像素。
- (如无合适照片请该人员登陆秦安APP中进行人脸照片采集)
+ (如无合适照片请该人员登陆交运安全APP中进行人脸照片采集)
@@ -969,12 +969,11 @@ const data = reactive({
});
const fnSelectPersonSubmit = (selectionData) => {
- const userIds = selectionData.map((item) => item.USER_ID).join(",");
- const names = selectionData.map((item) => item.NAME).join(",");
- data.form.PERSON_ID = userIds;
- data.form.NAME = names;
+ data.form.PERSON_ID = selectionData.USER_ID;
+ data.form.NAME = selectionData.NAME;
data.form.faceFile = "";
- fnGetData(userIds);
+ const userId = selectionData.USER_ID;
+ fnGetData(userId);
};
const fnGetData = async (USER_ID) => {
diff --git a/src/views/enterprise_management/user_practitioner/components/select_person.vue b/src/views/enterprise_management/user_practitioner/components/select_person.vue
index 7982bb5..dd73f2d 100644
--- a/src/views/enterprise_management/user_practitioner/components/select_person.vue
+++ b/src/views/enterprise_management/user_practitioner/components/select_person.vue
@@ -68,7 +68,6 @@
diff --git a/src/views/enterprise_management/user_practitioner/edit.vue b/src/views/enterprise_management/user_practitioner/edit.vue
index bbf513e..765df8f 100644
--- a/src/views/enterprise_management/user_practitioner/edit.vue
+++ b/src/views/enterprise_management/user_practitioner/edit.vue
@@ -660,7 +660,7 @@
图像分辨率:大于32×32像素,小于4096×4096像素,人脸占比不低于64×64像素。
- (如无合适照片请该人员登陆秦安APP中进行人脸照片采集)
+ (如无合适照片请该人员登陆交运安全APP中进行人脸照片采集)
diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
index 5ecc5e9..1b5de42 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
@@ -350,6 +350,10 @@ const data = reactive({
visible: false,
file: [],
},
+ form: {
+ LATITUDE: "",
+ LONGITUDE: "",
+ },
mapDialogVisible: false,
});
const { list: inspectionList } = useListData(
@@ -361,7 +365,8 @@ const { list: inspectionList } = useListData(
usePagination: false,
callbackFn: (list, resData) => {
info.value = resData.pd;
- console.log("111", info.value);
+ data.form.LATITUDE = info.value.LATITUDE;
+ data.form.LONGITUDE = info.value.LONGITUDE;
if (resData.qianming && resData.qianming.length > 0) {
qianming.value = VITE_FILE_URL + resData.qianming[0].FILEPATH;
}
diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/map.vue b/src/views/hazard_investigation/checklist_inspection_status/components/map.vue
index 1778ccf..b88c2c2 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/components/map.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/components/map.vue
@@ -64,8 +64,8 @@ const fnMapInit = async () => {
mapInstance = new window.BMapGL.Map("map_container");
mapInstance.centerAndZoom(
new window.BMapGL.Point(
- resData.cinfo.LONGITUDE || "116.3972282409668",
- resData.cinfo.LATITUDE || "39.90960456049752"
+ resData.checkrecord.LONGITUDE || "116.3972282409668",
+ resData.checkrecord.LATITUDE || "39.90960456049752"
),
16
);
diff --git a/src/views/hidden_danger_government/major/index.vue b/src/views/hidden_danger_government/major/index.vue
index 9397714..8d10d51 100644
--- a/src/views/hidden_danger_government/major/index.vue
+++ b/src/views/hidden_danger_government/major/index.vue
@@ -68,7 +68,8 @@
- {{ translationStatus(row.STATE, stateList) }}
+ 未确认
+ 已确认
@@ -119,7 +120,7 @@