diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js
index 29ac496..cf2c357 100644
--- a/src/assets/js/constant.js
+++ b/src/assets/js/constant.js
@@ -16,7 +16,7 @@ export const MENU = [
{ title: "双重预防", model: MODEL["3"] },
{ title: "教育培训", model: MODEL["4"] },
{ title: "综合管理", model: MODEL["5"] },
- { title: "定位管理", model: MODEL["6"] },
+ // { title: "定位管理", model: MODEL["6"] },
];
// 安全生成及电子运单管理
export const PRACTITIONERMENU = [
@@ -139,11 +139,11 @@ export const REMINDER_STATUS = [
{ ID: "1", NAME: "关闭" },
];
-export const REMIND_DAYS = [
+export const REMIND_DAYS = [
// 提醒天数
{ ID: "0", NAME: "30天", NUM: "30" },
{ ID: "1", NAME: "45天", NUM: "45" },
- { ID: "2", NAME: "90天", NUM: "90" }
+ { ID: "2", NAME: "90天", NUM: "90" },
];
// export const MAINTENANCE_LEVEL_LIST = [
diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js
index 5b6acdb..a601c10 100644
--- a/src/assets/js/utils.js
+++ b/src/assets/js/utils.js
@@ -414,8 +414,6 @@ export function subtractDaysFromDate(date, daysToSubtract, type = false) {
} else if (Object.prototype.toString.call(date) === "[object Date]") {
// 直接传入了 Date 对象
newDate = date;
- } else {
- console.log("无效的输入参数");
}
if (type) {
newDate.setDate(newDate.getDate() + daysToSubtract);
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
index d376b91..aeb8e35 100644
--- a/src/layout/header/index.vue
+++ b/src/layout/header/index.vue
@@ -4,9 +4,9 @@
-
-
- 3、是否下载【培训证明】
-
-
-
-
-
关闭
@@ -131,9 +119,6 @@ const fnSubmit = async () => {
if (form.value.register) {
form.value.checkArchivesList.push({ sort: 50, label: "人员登记表" });
}
- if (form.value.certificate) {
- form.value.checkArchivesList.push({ sort: 60, label: "培训证明" });
- }
if (form.value.checkArchivesList.length === 0) {
ElMessage.warning("请选择要导出的项");
return;
diff --git a/src/views/driving_inspections/driving_commitment/components/add.vue b/src/views/driving_inspections/driving_commitment/components/add.vue
index 2d13049..89f8086 100644
--- a/src/views/driving_inspections/driving_commitment/components/add.vue
+++ b/src/views/driving_inspections/driving_commitment/components/add.vue
@@ -7,9 +7,9 @@
@@ -26,7 +26,10 @@ import { useVModels } from "@vueuse/core";
import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
import { ElMessage } from "element-plus";
-import {setDrivingCommitmentAdd, setDrivingCommitmentEdit} from "@/request/traffic_driving_commitment.js";
+import {
+ setDrivingCommitmentAdd,
+ setDrivingCommitmentEdit,
+} from "@/request/traffic_driving_commitment.js";
const props = defineProps({
visible: {
diff --git a/src/views/driving_inspections/driving_log/drivingLog_info.vue b/src/views/driving_inspections/driving_log/drivingLog_info.vue
index 4cccc8f..529ce8d 100644
--- a/src/views/driving_inspections/driving_log/drivingLog_info.vue
+++ b/src/views/driving_inspections/driving_log/drivingLog_info.vue
@@ -146,7 +146,6 @@ const data = reactive({
});
const fnGetData = async () => {
const resData = await getSafetyDrivingLogView({ WAYBILLREGISTRATION_ID });
- console.log(resData, "11111111111");
data.info = resData.pd;
data.commitmentList = resData.commitmentList;
};
diff --git a/src/views/driving_inspections/driving_type/components/add.vue b/src/views/driving_inspections/driving_type/components/add.vue
index 4eb6cd4..ae119d4 100644
--- a/src/views/driving_inspections/driving_type/components/add.vue
+++ b/src/views/driving_inspections/driving_type/components/add.vue
@@ -8,21 +8,21 @@
-
+
@@ -39,8 +39,11 @@ import { useVModels } from "@vueuse/core";
import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
import { ElMessage } from "element-plus";
-import {setDrivingTypeAdd, setDrivingTypeEdit} from "@/request/traffic_driving_type.js";
-import {layoutFnGetDrivingType} from "@/assets/js/data_dictionary.js";
+import {
+ setDrivingTypeAdd,
+ setDrivingTypeEdit,
+} from "@/request/traffic_driving_type.js";
+import { layoutFnGetDrivingType } from "@/assets/js/data_dictionary.js";
const props = defineProps({
visible: {
@@ -68,9 +71,7 @@ const rules = {
CHECKITEMNAME: [
{ required: true, message: "排查项名称不能为空", trigger: "blur" },
],
- REMARKS: [
- { required: true, message: "排查项说明不能为空", trigger: "blur" },
- ],
+ REMARKS: [{ required: true, message: "排查项说明不能为空", trigger: "blur" }],
};
const formRef = ref(null);
const fnClose = () => {
diff --git a/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue b/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue
index af0e3bf..3c2e6d6 100644
--- a/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue
+++ b/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue
@@ -33,18 +33,18 @@
{{ data.evaluationDialogForm.DEGREE_OF_EDUCATION }}
|
- 专业 |
- {{ data.evaluationDialogForm.MAJOR }} |
+ 毕业院校及专业 |
+ {{ data.evaluationDialogForm.UNIVERSITY }} |
职务/职称 |
- {{ data.evaluationDialogForm.DUTIES }} |
+ {{ data.evaluationDialogForm.DUTIES_NAME }} |
部门 |
{{ data.evaluationDialogForm.DEPARTMENT_NAME }} |
工种 |
{{ data.evaluationDialogForm.POST_NAME }} |
行业类别 |
- {{ data.evaluationDialogForm.INDUSTRY_ALL_NAME }} |
+ {{ data.evaluationDialogForm.CORP_TYPE_NAME }} |
联系电话 |
{{ data.evaluationDialogForm.PHONE }} |
diff --git a/src/views/effect_appraisal/enterprise_effect/studentStrengthenDetailsList.vue b/src/views/effect_appraisal/enterprise_effect/studentStrengthenDetailsList.vue
index 75d0d27..e946476 100644
--- a/src/views/effect_appraisal/enterprise_effect/studentStrengthenDetailsList.vue
+++ b/src/views/effect_appraisal/enterprise_effect/studentStrengthenDetailsList.vue
@@ -8,7 +8,7 @@
>
-
+
diff --git a/src/views/enterprise_management/basics_info_management/freight_trailer/add.vue b/src/views/enterprise_management/basics_info_management/freight_trailer/add.vue
index 46a1496..5fcee77 100644
--- a/src/views/enterprise_management/basics_info_management/freight_trailer/add.vue
+++ b/src/views/enterprise_management/basics_info_management/freight_trailer/add.vue
@@ -4,14 +4,6 @@
基本信息
-
- 下载模板
- 上传
-
@@ -278,7 +270,7 @@ import {
setFreightTrailerEdit,
} from "@/request/enterprise_management.js";
import { setUploadImg } from "@/request/api.js";
-import { ElMessage, ElMessageBox } from "element-plus";
+import { ElMessage } from "element-plus";
import { useRoute, useRouter } from "vue-router";
import useFormValidate from "@/assets/js/useFormValidate.js";
import { addingPrefixToFile } from "@/assets/js/utils.js";
@@ -377,16 +369,6 @@ const fnGetData = async () => {
};
fnGetData();
-const fnDownloadTemplate = async () => {
- await ElMessageBox.confirm("确定要下载excel模板吗?", {
- type: "warning",
- });
- window.open(
- import.meta.env[import.meta.env.DEV ? "VITE_PROXY" : "VITE_BASE_URL"] +
- "freightTrailer/downExcel"
- );
-};
-
const fnSubmit = debounce(
1000,
async () => {
diff --git a/src/views/enterprise_management/basics_info_management/freight_trailer/view.vue b/src/views/enterprise_management/basics_info_management/freight_trailer/view.vue
index 1ab2822..dd32320 100644
--- a/src/views/enterprise_management/basics_info_management/freight_trailer/view.vue
+++ b/src/views/enterprise_management/basics_info_management/freight_trailer/view.vue
@@ -125,7 +125,7 @@
打印
-
+
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
index 6721b13..a06223a 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
@@ -449,15 +449,14 @@ const rules = {
{ required: true, message: "请输入发动机号", trigger: "blur" },
{ min: 7, max: 8, message: "请输入7-8位发动机号", trigger: "blur" },
{
- pattern:
- /^[A-Z0-9a-z\d]{7,8}$/,
+ pattern: /^[A-Z0-9a-z\d]{7,8}$/,
message: "请输入正确的发动机号",
},
],
VOUCH_NUMBERLOAD: [
{ required: true, message: "请输入核定载人数", trigger: "blur" },
{ pattern: /^([1-9][0-9]*)$/, message: "请输入整数", trigger: "blur" },
- ]
+ ],
};
const formRef = ref(null);
const form = ref({
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
index d3b1e65..aec1834 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
@@ -5,10 +5,7 @@
-
+
@@ -328,7 +325,8 @@ import {
import {
findByIdOperatingVehicleInfo,
editOperatingVehicleInfo,
- addOperatingVehicleInfo, findByPlateNumber
+ addOperatingVehicleInfo,
+ findByPlateNumber,
} from "@/request/operation_vehicle.js";
import useFormValidate from "@/assets/js/useFormValidate.js";
@@ -343,17 +341,17 @@ import LayoutDepartment from "@/components/department/index.vue";
const route = useRoute();
const router = useRouter();
const { OPERATING_ID } = route.query;
-let plateNumber = ''
+let plateNumber = "";
const isPlateNumberRepetition = async (rule, vehicleNumber, callback) => {
if (vehicleNumber) {
const vehicleCount = await findByPlateNumber({ vehicleNumber });
- if(vehicleCount.pd) {
- if(vehicleCount.pd.PLATE_NUMBER === plateNumber){
+ if (vehicleCount.pd) {
+ if (vehicleCount.pd.PLATE_NUMBER === plateNumber) {
callback();
- }else{
- callback(new Error("车辆已存在"))
+ } else {
+ callback(new Error("车辆已存在"));
}
- }else callback();
+ } else callback();
}
};
const isVehicleNumber = (rule, vehicleNumber, callback) => {
@@ -495,7 +493,7 @@ const fnGetData = async () => {
form.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile(
resData.operatingcertificatephoto
);
- plateNumber = form.value.PLATE_NUMBER
+ plateNumber = form.value.PLATE_NUMBER;
};
fnGetData();
const fnSubmit = debounce(
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
index 2638497..40fca3f 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
@@ -57,7 +57,7 @@
-
@@ -231,6 +232,11 @@ const reviewItem = async (row) => {
data.reviewDialog.form = row;
};
+/* const fnWindow = async () => {
+ window.open(
+ "http://60.10.47.50:9001/#/middlePage?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXNzd2QiOiJMZmtmcUAxMjM0NTYiLCJleHAiOjE3MTE2MjQ3NDQsInVzZXIiOiJsZnlqemhkcCIsInRhcmdldCI6Imh0dHA6Ly8xOTIuMTY4LjAuNjk6ODA4Mi8jL21pZGRsZVBhZ2UifQ.nkVxqT3lcNkNIW1jiJY71gyXazJWyfHgfClWnbaFz8I"
+ );
+}; */
// 页面下拉选项字典获取
const fnGetLevels = async () => {
const { value: personnelTypeList } = await layoutFnGetPersonnelTypeTraffic({
diff --git a/src/views/enterprise_management/user_practitioner/review.vue b/src/views/enterprise_management/user_practitioner/review.vue
index 60c7a04..4054543 100644
--- a/src/views/enterprise_management/user_practitioner/review.vue
+++ b/src/views/enterprise_management/user_practitioner/review.vue
@@ -350,10 +350,10 @@ const fnSubmit = debounce(
}
if (form.value.APPLY_TYPE === "1" && form.value.REVIEW_RESULT === "1")
- form.value.INCUMBENCY = "bd4d802e94354230b1bb19cfabd7f810"; // 在职:bd4d802e94354230b1bb19cfabd7f810
+ form.value.INCUMBENCY = "bd4d802e94354230b1bb19cfabd7f810";
+ // 在职:bd4d802e94354230b1bb19cfabd7f810
else if (form.value.APPLY_TYPE === "3" && form.value.REVIEW_RESULT === "1")
form.value.INCUMBENCY = "4dd28e91b104410b85c25a792c424172"; // 离职:4dd28e91b104410b85c25a792c424172
- // console.log(form.value);
await setPractitionerReview({ ...form.value });
ElMessage.success("操作成功");
fnClose();
diff --git a/src/views/hazard_investigation/inspection_record/index.vue b/src/views/hazard_investigation/inspection_record/index.vue
index ceccff5..f7035f9 100644
--- a/src/views/hazard_investigation/inspection_record/index.vue
+++ b/src/views/hazard_investigation/inspection_record/index.vue
@@ -24,7 +24,6 @@
/>
-
-
搜索
diff --git a/src/views/hazard_investigation/inventory_management/add.vue b/src/views/hazard_investigation/inventory_management/add.vue
index 3fe139a..a3c9ec6 100644
--- a/src/views/hazard_investigation/inventory_management/add.vue
+++ b/src/views/hazard_investigation/inventory_management/add.vue
@@ -178,7 +178,7 @@
选择其他存在风险
@@ -219,9 +219,9 @@
@get-data="fnAddRiskSubmit"
/>
{
data.listAll.push(item);
fnTableSelection();
};
-const fnSelectPersonSubmit = (listData) => {
+const fnSelectRiskSubmit = (listData) => {
data.list.push(...listData);
data.listAll.push(...listData);
fnTableSelection();
diff --git a/src/views/hazard_investigation/inventory_management/components/inspection_route.vue b/src/views/hazard_investigation/inventory_management/components/inspection_route.vue
index 13e6b5d..6e97211 100644
--- a/src/views/hazard_investigation/inventory_management/components/inspection_route.vue
+++ b/src/views/hazard_investigation/inventory_management/components/inspection_route.vue
@@ -57,6 +57,7 @@ import { useVModels } from "@vueuse/core";
import { ElMessage } from "element-plus";
import { debounce } from "throttle-debounce";
import { setInventoryManagementRoute } from "@/request/hazard_investigation.js";
+import { VueDraggable } from "vue-draggable-plus";
const props = defineProps({
visible: {
diff --git a/src/views/hidden_danger_government/ledger/index.vue b/src/views/hidden_danger_government/ledger/index.vue
index 06a8959..07be874 100644
--- a/src/views/hidden_danger_government/ledger/index.vue
+++ b/src/views/hidden_danger_government/ledger/index.vue
@@ -209,7 +209,6 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
},
defaultSearchForm: { STATE },
});
-console.log(searchForm, "asdsadsadas");
const fnGetDataTransfer = () => {
fnGetData({
STARTTIME: searchForm.value.dates?.[0],
diff --git a/src/views/labor_contract/components/add.vue b/src/views/labor_contract/components/add.vue
index bc8d65c..82c2b0a 100644
--- a/src/views/labor_contract/components/add.vue
+++ b/src/views/labor_contract/components/add.vue
@@ -24,7 +24,7 @@
diff --git a/src/views/labor_contract/details.vue b/src/views/labor_contract/details.vue
index 0f1267c..f681534 100644
--- a/src/views/labor_contract/details.vue
+++ b/src/views/labor_contract/details.vue
@@ -102,7 +102,7 @@
diff --git a/src/views/safety_production_related/safety_meeting/meeting_info.vue b/src/views/safety_production_related/safety_meeting/meeting_info.vue
index 98837fa..4660d1f 100644
--- a/src/views/safety_production_related/safety_meeting/meeting_info.vue
+++ b/src/views/safety_production_related/safety_meeting/meeting_info.vue
@@ -131,7 +131,6 @@ const detailItems = ref({
const fnGetData = async () => {
const response = await getSafetyMeetingView({ SAFETY_MEETING_ID });
- console.log(response, "1111111111111111111111111");
detailItems.value = response.pd;
};
fnGetData();
diff --git a/src/views/safety_responsibility/components/add.vue b/src/views/safety_responsibility/components/add.vue
index 5052991..d2edf5e 100644
--- a/src/views/safety_responsibility/components/add.vue
+++ b/src/views/safety_responsibility/components/add.vue
@@ -28,7 +28,7 @@
diff --git a/src/views/safety_responsibility/details.vue b/src/views/safety_responsibility/details.vue
index 6d7889c..78a8a80 100644
--- a/src/views/safety_responsibility/details.vue
+++ b/src/views/safety_responsibility/details.vue
@@ -104,7 +104,7 @@