BUG优化

src/views/archives_management/enterprise/archives.vue

@@ -98,6 +98,7 @@ const fnExport = debounce(
     await ElMessageBox.confirm("确定要导出吗？", { type: "warning" });
     await downloadAllwordzip({
       YEAR: data.YEAR,
+      NAME: data.corp_name,
     });
     await ElMessageBox.confirm(
       "导出后请前往档案下载中下载该档案！",

src/views/archives_management/user/class.vue

@@ -108,7 +108,7 @@
                   row.STATE === '6' ||
                   (row.EXAMINATION === 1 &&
                     parseInt(row.STAGEEXAMSCORE) > -1 &&
-                    parseInt(row.STUDYSTATE) !== 5) ||
+                    (parseInt(row.STUDYSTATE) !== 5 || row.STAGEEXAMSCORE)) ||
                   (row.EXAMINATION === 0 && parseInt(row.STUDYSTATE) > 1)
                 )
               "

src/views/enterprise_management/information/edit.vue

@@ -231,11 +231,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="组织部门" prop="PLAN_DEPARTMENT">
+            <el-form-item label="培训组织部门" prop="PLAN_DEPARTMENT">
               <el-input
                 v-model="data.form.PLAN_DEPARTMENT"
                 placeholder="请输入内容"
               />
+              <div style="line-height: 1.6" class="mt-10">
+                <div style="color: red; font-size: 12px">
+                  *注：用于维护教育培训“交通运输”类型班级的“一期一档-教育培训记录”中的组织部门、“一期一档-综合考评报告”中的培训组织部门
+                </div>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/enterprise_management/information/info.vue

@@ -81,7 +81,7 @@
       <el-descriptions-item label="企业可新建用户数量">
         {{ data.info.USERS_NUM }}
       </el-descriptions-item>
-      <el-descriptions-item label="组织部门">
+      <el-descriptions-item label="培训组织部门">
         {{ data.info.PLAN_DEPARTMENT }}
       </el-descriptions-item>
       <el-descriptions-item

src/views/enterprise_management/user/add.vue

@@ -351,7 +351,7 @@
                         图像分辨率：大于32×32像素，小于4096×4096像素，人脸占比不低于64×64像素。
                       </div>
                       <div style="color: red; font-size: 12px">
-                        （如无合适照片请该人员登陆秦安APP中进行人脸照片采集）
+                        （如无合适照片请该人员登陆交运安全APP中进行人脸照片采集）
                       </div>
                     </div>
                   </template>

src/views/enterprise_management/user_practitioner/add.vue

@@ -667,7 +667,7 @@
                     图像分辨率：大于32×32像素，小于4096×4096像素，人脸占比不低于64×64像素。
                   </div>
                   <div style="color: red; font-size: 12px">
-                    （如无合适照片请该人员登陆秦安APP中进行人脸照片采集）
+                    （如无合适照片请该人员登陆交运安全APP中进行人脸照片采集）
                   </div>
                 </div>
               </template>
@@ -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 ||

src/views/enterprise_management/user_practitioner/choiceadd.vue

@@ -696,7 +696,7 @@
                     图像分辨率：大于32×32像素，小于4096×4096像素，人脸占比不低于64×64像素。
                   </div>
                   <div style="color: red; font-size: 12px">
-                    （如无合适照片请该人员登陆秦安APP中进行人脸照片采集）
+                    （如无合适照片请该人员登陆交运安全APP中进行人脸照片采集）
                   </div>
                 </div>
               </template>
@@ -969,12 +969,11 @@ const data = reactive({
 });
 
 const fnSelectPersonSubmit = (selectionData) => {
-  const userIds = selectionData.map((item) => item.USER_ID).join(",");
+  data.form.PERSON_ID = selectionData.USER_ID;
-  const names = selectionData.map((item) => item.NAME).join(",");
+  data.form.NAME = selectionData.NAME;
-  data.form.PERSON_ID = userIds;
-  data.form.NAME = names;
   data.form.faceFile = "";
-  fnGetData(userIds);
+  const userId = selectionData.USER_ID;
+  fnGetData(userId);
 };
 
 const fnGetData = async (USER_ID) => {

src/views/enterprise_management/user_practitioner/components/select_person.vue

@@ -68,7 +68,6 @@
 
 <script setup>
 import { useVModel } from "@vueuse/core";
-import { debounce } from "throttle-debounce";
 import useListData from "@/assets/js/useListData.js";
 import { reactive, watch } from "vue";
 import { serialNumber } from "@/assets/js/utils.js";
@@ -92,6 +91,7 @@ const { list, searchForm, pagination, fnGetData, fnResetPagination, tableRef } =
   });
 const data = reactive({
   personnelTypeList: [],
+  personData: {},
 });
 
 const { value: personnelTypeList } = await layoutFnGetPersonnelTypeTraffic({
@@ -111,15 +111,13 @@ const stop = watch(
 const fnClose = () => {
   visible.value = false;
 };
-const fnSubmit = debounce(
+
-  1000,
+const fnSubmit = (dataInfo) => {
-  () => {
+  data.personData = dataInfo;
-    const selectionData = tableRef.value.getSelectionRows();
+  const selectionData = data.personData;
-    fnClose();
+  fnClose();
-    emits("submit", selectionData);
+  emits("submit", selectionData);
-  },
+};
-  { atBegin: true }
-);
 </script>
 
 <style scoped lang="scss"></style>

src/views/enterprise_management/user_practitioner/edit.vue

@@ -660,7 +660,7 @@
                     图像分辨率：大于32×32像素，小于4096×4096像素，人脸占比不低于64×64像素。
                   </div>
                   <div style="color: red; font-size: 12px">
-                    （如无合适照片请该人员登陆秦安APP中进行人脸照片采集）
+                    （如无合适照片请该人员登陆交运安全APP中进行人脸照片采集）
                   </div>
                 </div>
               </template>

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;
       }

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.checkrecord.LONGITUDE || "116.3972282409668",
-      resData.cinfo.LATITUDE || "39.90960456049752"
+      resData.checkrecord.LATITUDE || "39.90960456049752"
     ),
     16
   );

src/views/hidden_danger_government/major/index.vue

@@ -68,7 +68,8 @@
         <el-table-column prop="HIDDENLEVELNAME" label="隐患级别" width="120" />
         <el-table-column label="隐患状态" width="100">
           <template #default="{ row }">
-            {{ translationStatus(row.STATE, stateList) }}
+            <span v-if="ISMAIN === '1' && row.ISCONFIRM === '0'"> 未确认 </span>
+            <span v-else> 已确认 </span>
           </template>
         </el-table-column>
         <el-table-column prop="CREATTIME" label="发现时间" width="160" />
@@ -119,7 +120,7 @@
 
 <script setup>
 import { useRouter } from "vue-router";
-import { serialNumber, translationStatus } from "@/assets/js/utils";
+import { serialNumber } from "@/assets/js/utils";
 import useListData from "@/assets/js/useListData.js";
 import {
   getHiddenDangerListAll,
@@ -128,12 +129,6 @@ import {
 import { useUserStore } from "@/pinia/user.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 
-const stateList = [
-  { NAME: "未整改", ID: "1" },
-  { NAME: "已整改", ID: "3" },
-  { NAME: "已验收", ID: "4" },
-  { NAME: "已过期", ID: "-1" },
-];
 const router = useRouter();
 const userStore = useUserStore();
 const ISMAIN = userStore.getUserInfo.ISMAIN;