From f2d72723ef43cf6c393352449c0d175f3239e770 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Mon, 1 Apr 2024 09:21:56 +0800 Subject: [PATCH 01/64] =?UTF-8?q?=E4=BB=8E=E5=8D=B1=E5=8C=96=E7=89=88?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/constant.js | 2 +- src/layout/header/index.vue | 4 ++-- src/request/data_dictionary.js | 16 ++++++++-------- .../user_practitioner/index.vue | 6 ++++++ .../inspection_record/index.vue | 2 -- .../inventory_management/add.vue | 12 +++++++----- .../components/inspection_route.vue | 1 + 7 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js index 29ac496..09184d6 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 = [ 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 @@ @@ -224,7 +225,6 @@ import { setInspectAnnuallyDelete, setInspectAnnuallyEdit2, } from "@/request/mechanical_files.js"; -import ExportExcel from "./components/export_excel.vue"; import { reactive } from "vue"; import { debounce } from "throttle-debounce"; import { ElMessageBox, ElMessage } from "element-plus"; @@ -233,12 +233,15 @@ import { DUE_STATUS_LIST, REMINDER_STATUS_LIST, } from "@/assets/js/constant.js"; +import { setFreightTrailerImport } from "@/request/enterprise_management.js"; +import LayoutImportFile from "@/components/import_file/index.vue"; const router = useRouter(); const data = reactive({ exportExcelDialog: { visible: false, ids: [], }, + importDialogVisible: false, }); const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } = useListData(getInspectAnnuallyList); @@ -301,6 +304,22 @@ const fnStatusChange = debounce( ); const buttonJurisdiction = await useButtonJurisdiction("hidden"); +const fnImportDialogChangeShow = () => { + data.importDialogVisible = !data.importDialogVisible; +}; + +const fnSubmitImport = async (formData) => { + const resData = await setFreightTrailerImport(formData); + if (resData.resultStr) { + ElMessage({ + dangerouslyUseHTMLString: true, + message: resData.resultStr, + type: resData.resultType, + }); + } + fnImportDialogChangeShow(); + fnResetPaginationTransfer(); +}; const fnExport = async () => { const selectionData = tableRef.value.getSelectionRows(); @@ -315,7 +334,7 @@ const fnExport = async () => { .join(","); window.location.href = import.meta.env[import.meta.env.DEV ? "VITE_PROXY" : "VITE_BASE_URL"] + - "/operatingvehicles/excel?" + + "/inspectAnnually/excel?" + "&KEYWORDS=" + (searchForm.value.KEYWORDS || "") + "&DATA_IDS=" + diff --git a/src/views/mechanical_files/scrap_manage/add.vue b/src/views/mechanical_files/scrap_manage/add.vue index 01317cf..5105e9e 100644 --- a/src/views/mechanical_files/scrap_manage/add.vue +++ b/src/views/mechanical_files/scrap_manage/add.vue @@ -393,7 +393,6 @@ const fnSubmit = debounce( 1000, async () => { await useFormValidate(formRef); - console.log("form.value",form.value); await setScrapManageAdd({ ...form.value }); ElMessage.success("提交成功"); router.back(); From 456855000a54ce89bace2af99808ba6f5dd91733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B2=81=E6=B4=AA=E9=9C=9E?= Date: Mon, 1 Apr 2024 17:25:09 +0800 Subject: [PATCH 04/64] =?UTF-8?q?=E9=B2=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/index/components/annualTraining.vue | 132 +++++++++++++ src/views/index/components/count.vue | 177 ++++++------------ .../index/components/doublePrevention.vue | 54 ++++++ .../components/doublePreventionCheck.vue | 135 +++++++++++++ src/views/index/components/info.vue | 94 ++++++++++ .../rectificationOfHiddenDangers.vue | 86 +++++++++ src/views/index/components/statistics.vue | 86 +++++++++ .../index/components/trainingStatistics.vue | 52 +++++ src/views/index/components/waybill.vue | 53 ++++++ src/views/index/index.vue | 48 +++-- 10 files changed, 779 insertions(+), 138 deletions(-) create mode 100644 src/views/index/components/annualTraining.vue create mode 100644 src/views/index/components/doublePrevention.vue create mode 100644 src/views/index/components/doublePreventionCheck.vue create mode 100644 src/views/index/components/info.vue create mode 100644 src/views/index/components/rectificationOfHiddenDangers.vue create mode 100644 src/views/index/components/statistics.vue create mode 100644 src/views/index/components/trainingStatistics.vue create mode 100644 src/views/index/components/waybill.vue diff --git a/src/views/index/components/annualTraining.vue b/src/views/index/components/annualTraining.vue new file mode 100644 index 0000000..1df6b04 --- /dev/null +++ b/src/views/index/components/annualTraining.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/index/components/count.vue b/src/views/index/components/count.vue index 3163d35..95113d5 100644 --- a/src/views/index/components/count.vue +++ b/src/views/index/components/count.vue @@ -1,140 +1,77 @@ diff --git a/src/views/index/components/doublePrevention.vue b/src/views/index/components/doublePrevention.vue new file mode 100644 index 0000000..ab58944 --- /dev/null +++ b/src/views/index/components/doublePrevention.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/views/index/components/doublePreventionCheck.vue b/src/views/index/components/doublePreventionCheck.vue new file mode 100644 index 0000000..d3b534d --- /dev/null +++ b/src/views/index/components/doublePreventionCheck.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/index/components/info.vue b/src/views/index/components/info.vue new file mode 100644 index 0000000..f7f7878 --- /dev/null +++ b/src/views/index/components/info.vue @@ -0,0 +1,94 @@ + + + + diff --git a/src/views/index/components/rectificationOfHiddenDangers.vue b/src/views/index/components/rectificationOfHiddenDangers.vue new file mode 100644 index 0000000..747a8d9 --- /dev/null +++ b/src/views/index/components/rectificationOfHiddenDangers.vue @@ -0,0 +1,86 @@ + + + + diff --git a/src/views/index/components/statistics.vue b/src/views/index/components/statistics.vue new file mode 100644 index 0000000..fa3cd9c --- /dev/null +++ b/src/views/index/components/statistics.vue @@ -0,0 +1,86 @@ + + + + diff --git a/src/views/index/components/trainingStatistics.vue b/src/views/index/components/trainingStatistics.vue new file mode 100644 index 0000000..1693945 --- /dev/null +++ b/src/views/index/components/trainingStatistics.vue @@ -0,0 +1,52 @@ + + + + diff --git a/src/views/index/components/waybill.vue b/src/views/index/components/waybill.vue new file mode 100644 index 0000000..04e5a48 --- /dev/null +++ b/src/views/index/components/waybill.vue @@ -0,0 +1,53 @@ + + + + diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 7e93c5f..6a913dd 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -3,25 +3,29 @@ - - - - - - + - + - - + + + + + + + + + + + - - - - + + + @@ -29,11 +33,19 @@ diff --git a/src/views/occupational_hazards/components/add.vue b/src/views/occupational_hazards/components/add.vue index 46700f8..da0a617 100644 --- a/src/views/occupational_hazards/components/add.vue +++ b/src/views/occupational_hazards/components/add.vue @@ -17,13 +17,13 @@ clearable > - {{ form.OPERATINGCOMPANY }} - + --> - - + + - - - - - - + + + + + - + diff --git a/src/views/safety_assessment/components/add.vue b/src/views/safety_assessment/components/add.vue index cb4b465..b54fc10 100644 --- a/src/views/safety_assessment/components/add.vue +++ b/src/views/safety_assessment/components/add.vue @@ -13,13 +13,13 @@ clearable > - {{ operatingCompany }} - + --> 未生效 - + diff --git a/src/views/safety_culture/safety_activities/components/add.vue b/src/views/safety_culture/safety_activities/components/add.vue index e443c53..1c1764c 100644 --- a/src/views/safety_culture/safety_activities/components/add.vue +++ b/src/views/safety_culture/safety_activities/components/add.vue @@ -12,13 +12,13 @@ style="width: 300px" > - {{ operatingCompany }} - + --> 未生效 - + diff --git a/src/views/safety_culture/safety_manual/components/add.vue b/src/views/safety_culture/safety_manual/components/add.vue index f0164cf..b85e37a 100644 --- a/src/views/safety_culture/safety_manual/components/add.vue +++ b/src/views/safety_culture/safety_manual/components/add.vue @@ -12,13 +12,13 @@ style="width: 300px" > - {{ operatingCompany }} - + --> 未生效 - + diff --git a/src/views/safety_production/components/add.vue b/src/views/safety_production/components/add.vue index f6a42f6..1916ea8 100644 --- a/src/views/safety_production/components/add.vue +++ b/src/views/safety_production/components/add.vue @@ -13,13 +13,13 @@ clearable > - {{ form.OPERATINGCOMPANY }} - + --> 未生效 - + diff --git a/src/views/safety_responsibility/components/add.vue b/src/views/safety_responsibility/components/add.vue index d2edf5e..f8f8979 100644 --- a/src/views/safety_responsibility/components/add.vue +++ b/src/views/safety_responsibility/components/add.vue @@ -17,13 +17,13 @@ clearable > - {{ form.OPERATINGCOMPANY }} - + --> 未生效 - - + diff --git a/src/views/security_commitment/components/add.vue b/src/views/security_commitment/components/add.vue index 66e4ddb..8a85fcc 100644 --- a/src/views/security_commitment/components/add.vue +++ b/src/views/security_commitment/components/add.vue @@ -18,13 +18,13 @@ style="width: 300px" > - {{ form.OPERATINGCOMPANY }} - + --> 未生效 - - + From 43b92877218452af7471a6d215e253544c7ed81b Mon Sep 17 00:00:00 2001 From: xiepeng Date: Tue, 2 Apr 2024 18:52:04 +0800 Subject: [PATCH 07/64] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user_practitioner/details.vue | 57 +++++++++++++++++++ src/views/mechanical_files/insure/index.vue | 8 ++- .../mechanical_files/maintenance/index.vue | 34 ++++++++--- .../mechanical_files/operations/edit.vue | 3 +- .../mechanical_files/operations/index.vue | 35 ++++++++---- .../production_accident/add.vue | 2 +- 6 files changed, 114 insertions(+), 25 deletions(-) diff --git a/src/views/enterprise_management/user_practitioner/details.vue b/src/views/enterprise_management/user_practitioner/details.vue index 35428c8..c84dd4c 100644 --- a/src/views/enterprise_management/user_practitioner/details.vue +++ b/src/views/enterprise_management/user_practitioner/details.vue @@ -5,6 +5,12 @@ {{ data.info.NAME }} + + {{ data.info.PHONE }} + + + {{ data.info.DATE_OF_BIRTH }} + {{ data.info.PERSONNEL_TYPE_NAME }} @@ -41,6 +47,15 @@ {{ data.info.WORKING_DATE }} + + {{ data.info.SORT }} + + + {{ data.info.EMAIL }} + + + {{ data.info.BZ }} +
@@ -53,6 +68,40 @@ }} + diff --git a/src/views/mechanical_files/insure/index.vue b/src/views/mechanical_files/insure/index.vue index 55cac29..271df49 100644 --- a/src/views/mechanical_files/insure/index.vue +++ b/src/views/mechanical_files/insure/index.vue @@ -137,8 +137,12 @@ diff --git a/src/views/mechanical_files/maintenance/index.vue b/src/views/mechanical_files/maintenance/index.vue index 763c2be..6980159 100644 --- a/src/views/mechanical_files/maintenance/index.vue +++ b/src/views/mechanical_files/maintenance/index.vue @@ -108,22 +108,38 @@ - + diff --git a/src/views/mechanical_files/operations/edit.vue b/src/views/mechanical_files/operations/edit.vue index ab8fa90..ebcc1ad 100644 --- a/src/views/mechanical_files/operations/edit.vue +++ b/src/views/mechanical_files/operations/edit.vue @@ -19,7 +19,7 @@ - + - + @@ -119,25 +119,35 @@ 开启 + >开启 + 关闭 + >关闭 + - + @@ -237,6 +247,7 @@ import { REMINDER_STATUS_LIST, } from "@/assets/js/constant.js"; +console.log("-=-=-==", await getOperationsList()); const router = useRouter(); const data = reactive({ exportExcelDialog: { diff --git a/src/views/mechanical_files/production_accident/add.vue b/src/views/mechanical_files/production_accident/add.vue index dd26688..1296298 100644 --- a/src/views/mechanical_files/production_accident/add.vue +++ b/src/views/mechanical_files/production_accident/add.vue @@ -24,7 +24,7 @@ - + From d669e371a0d426a1e7433071e590f6f09fdc9038 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Wed, 3 Apr 2024 09:26:05 +0800 Subject: [PATCH 08/64] 14962 --- index.html | 2 +- public/favicon.ico | Bin 0 -> 16958 bytes public/vite.svg | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 public/favicon.ico delete mode 100644 public/vite.svg diff --git a/index.html b/index.html index 98432fa..8f0f120 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + 交通运输安全生产综合管理系统 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..ae2e4d4da5a4634b8e806a4261e217c2b20cf8b6 GIT binary patch literal 16958 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 literal 0 HcmV?d00001 diff --git a/public/vite.svg b/public/vite.svg deleted file mode 100644 index e7b8dfb..0000000 --- a/public/vite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From c57edc5b224dcf1ad21e58d0f3033be8d66a1bbc Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 3 Apr 2024 17:57:47 +0800 Subject: [PATCH 09/64] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/assigned_manage.js | 4 +- src/request/scrap_manage.js | 4 +- .../user_practitioner/details.vue | 12 ++-- .../mechanical_files/assigned_manage/add.vue | 16 ++--- .../assigned_manage/index.vue | 3 +- .../mechanical_files/assigned_manage/view.vue | 3 +- src/views/mechanical_files/beidou/add.vue | 4 +- src/views/mechanical_files/beidou/index.vue | 22 ++++--- .../mechanical_files/inspect_annually/add.vue | 5 +- .../inspect_annually/edit.vue | 12 ++-- .../inspect_annually/index.vue | 35 ++++++++--- src/views/mechanical_files/insure/index.vue | 26 ++++++-- .../mechanical_files/maintenance/add.vue | 4 +- .../mechanical_files/maintenance/index.vue | 12 +--- src/views/mechanical_files/operations/add.vue | 4 +- .../mechanical_files/operations/index.vue | 61 +++++-------------- .../mechanical_files/operations/view.vue | 1 + .../production_accident/add.vue | 4 +- .../taxation_manage/index.vue | 43 ++++++++----- src/views/security_commitment/details.vue | 6 +- 20 files changed, 141 insertions(+), 140 deletions(-) diff --git a/src/request/assigned_manage.js b/src/request/assigned_manage.js index a54eb81..b98ca3b 100644 --- a/src/request/assigned_manage.js +++ b/src/request/assigned_manage.js @@ -70,7 +70,7 @@ export const getVehicleView = (params) => upload("/operatingvehicles/operationvehicleList", params); // 获取所有车船税 export const getAssignedOperationVehicleList = (params) => - post("/assignedmanage/getassignedoperationvehiclelist", params); // 车型选择营运车辆列表 + post("/assignedmanage/getAssignedVehicleList", params); // 车型选择营运车辆列表 export const getAssignedFreightTrailerList = (params) => - post("/assignedmanage/getassignedfreighttrailerlist", params); // 车型选择货物挂车列表 + post("/assignedmanage/getAssignedFreightTrailerList", params); // 车型选择货物挂车列表 diff --git a/src/request/scrap_manage.js b/src/request/scrap_manage.js index 5e0f6e0..4b16304 100644 --- a/src/request/scrap_manage.js +++ b/src/request/scrap_manage.js @@ -26,7 +26,7 @@ export const getOperationVehicleList = (params) => upload("/operatingvehicles/operationvehicleList", params); // 获取所有车船税 export const getScrapOperationVehicleList = (params) => - post("/scrapmanage/getscrapoperationvehiclelist", params); // 车型选择营运车辆列表 + post("/scrapmanage/getScrapOperationVehicleList", params); // 车型选择营运车辆列表 export const getScrapFreightTrailerList = (params) => - post("/scrapmanage/getscrapfreighttrailerlist", params); // 车型选择货物挂车列表 + post("/scrapmanage/getScrapFreightTrailerList", params); // 车型选择货物挂车列表 diff --git a/src/views/enterprise_management/user_practitioner/details.vue b/src/views/enterprise_management/user_practitioner/details.vue index c84dd4c..17ec9f4 100644 --- a/src/views/enterprise_management/user_practitioner/details.vue +++ b/src/views/enterprise_management/user_practitioner/details.vue @@ -29,8 +29,8 @@ {{ data.info.ENTRY_DATE }} - - {{ data.info.DATE_OF_BIRTH }} + + {{ data.info.USERNAME }} {{ data.info.SEX ? (data.info.SEX === "1" ? "男" : "女") : "" }} @@ -47,15 +47,12 @@ {{ data.info.WORKING_DATE }} - + {{ data.info.EMAIL }} - - {{ data.info.BZ }} -
@@ -180,6 +177,7 @@ const fnGetData = async () => { if (!USER_ID) return; const resData = await getPractitionerInfo({ USER_ID }); data.info = resData.pd; + console.log("-=-=--=-=",data.info); resData.certificateList.forEach((item) => { item.ID_PHOTO_FRONT = FILE_URL + item.ID_PHOTO_FRONT; if (item.ID_PHOTO_BACK) { diff --git a/src/views/mechanical_files/assigned_manage/add.vue b/src/views/mechanical_files/assigned_manage/add.vue index 1f0a5e6..12c53f4 100644 --- a/src/views/mechanical_files/assigned_manage/add.vue +++ b/src/views/mechanical_files/assigned_manage/add.vue @@ -35,9 +35,9 @@ > @@ -413,10 +413,7 @@ const fnEditVehicleModel = async () => { const fnGetVehicleInfo = async () => { if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") { for (let i = 0; i < form.value.OPERATIONVEHICLELIST.length; i++) { - if ( - form.value.OPERATIONVEHICLELIST[i].PLATE_NUMBER === - form.value.VEHICLE_PLATE_NUMBER - ) { + if (form.value.OPERATIONVEHICLELIST[i].OPERATING_ID === form.value.VEHICLE_PLATE_NUMBER) { const OPERATING_ID = form.value.OPERATIONVEHICLELIST[i].OPERATING_ID; const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID }); info.value = resData.pd; @@ -434,7 +431,7 @@ const fnGetVehicleInfo = async () => { form.value.ENGINE_NUMBER = info.value.ENGINE_NUMBER; form.value.POWER_TYPE = info.value.FUEL_TYPE; form.value.EMISSION_STANDARD = info.value.EMISSION_STANDARD; - form.value.RAW_PLATE_NUMBER = info.value.PLATE_NUMBER; + form.value.RAW_PLATE_NUMBER = info.value.OPERATING_ID; form.value.RAW_OWNERS = info.value.VEHICLEOWNER; form.value.RAW_CONTACT_NUMBER = info.value.CONTACT_NUMBER; form.value.RAW_OPERATION_CERTIFICATE = info.value.OPERATING_CERTIFICATE; @@ -446,7 +443,7 @@ const fnGetVehicleInfo = async () => { } else if (form.value.ASSIGNED_VEHICLE_MODEL === "货运挂车") { for (let i = 0; i < form.value.FREIGHTVEHICLELIST.length; i++) { if ( - form.value.FREIGHTVEHICLELIST[i].PLATE_NUMBER === + form.value.FREIGHTVEHICLELIST[i].FREIGHTTRAILER_ID === form.value.VEHICLE_PLATE_NUMBER ) { const FREIGHTTRAILER_ID = @@ -463,12 +460,11 @@ const fnGetVehicleInfo = async () => { info.value.DRIVING_LICENSE_IMG; form.value.VEHICLE_BRAND = info.value.TRAILER_BRAND; form.value.VEHICLE_MODEL = info.value.TRAILER_MODEL; - form.value.RAW_PLATE_NUMBER = info.value.PLATE_NUMBER; + form.value.RAW_PLATE_NUMBER = info.value.FREIGHTTRAILER_ID; form.value.RAW_OWNERS = info.value.CAR_OWNERS; form.value.RAW_CONTACT_NUMBER = info.value.CAR_OWNERS_TEL; form.value.RAW_OPERATION_CERTIFICATE = info.value.OPER_CERTIFICATE_NUM; form.value.FRAMES_NUMBER = info.value.VIN; - form.value.ENGINE_NUMBER = info.value.TRAILER_MODEL; form.value.POWER_TYPE = info.value.TRAILER_MODEL; form.value.VEHICLE.RAW_DRIVINGLICENSE_IMG = addingPrefixToFile( diff --git a/src/views/mechanical_files/assigned_manage/index.vue b/src/views/mechanical_files/assigned_manage/index.vue index 4f9b2a4..17402e1 100644 --- a/src/views/mechanical_files/assigned_manage/index.vue +++ b/src/views/mechanical_files/assigned_manage/index.vue @@ -116,7 +116,7 @@ - + 过户信息 - {{ info.RAW_PLATE_NUMBER }} + {{ info.PLATE_NUMBER }} {{ info.RAW_OWNERS }} @@ -124,6 +124,7 @@ const info = ref({}); const getData = async () => { const resData = await findByIdAssignedManageInfo({ ASSIGNED_ID }); info.value = resData.pd; + console.log("-=-=",info.value); info.value.NOW_VEHICLE_OPERATION_CERTIFICATE = addingPrefixToFile( resData.nowVehicleOperationCertificateImgs ); diff --git a/src/views/mechanical_files/beidou/add.vue b/src/views/mechanical_files/beidou/add.vue index 05ccfdf..ace6673 100644 --- a/src/views/mechanical_files/beidou/add.vue +++ b/src/views/mechanical_files/beidou/add.vue @@ -6,8 +6,8 @@ 车辆选择 - - + + --> - + diff --git a/src/views/mechanical_files/inspect_annually/add.vue b/src/views/mechanical_files/inspect_annually/add.vue index 387c349..b815ba0 100644 --- a/src/views/mechanical_files/inspect_annually/add.vue +++ b/src/views/mechanical_files/inspect_annually/add.vue @@ -18,8 +18,8 @@ - - + + { if (!INSPECTANNUALLY_ID) return; const resData = await getInspectAnnuallyView({ INSPECTANNUALLY_ID }); form.value = resData.pd; + console.log("-==-=--=",form.value); const listData = await getTrailerList({ TRAFFIC_TYPE: form.value.VEHICLE_MODEL, }); diff --git a/src/views/mechanical_files/inspect_annually/edit.vue b/src/views/mechanical_files/inspect_annually/edit.vue index dc0d648..0e60588 100644 --- a/src/views/mechanical_files/inspect_annually/edit.vue +++ b/src/views/mechanical_files/inspect_annually/edit.vue @@ -3,7 +3,7 @@ - 车辆选择 + 车辆选择111 @@ -18,8 +18,8 @@ - - + + - - - - - 年检信息 @@ -398,6 +393,7 @@ const fnGetData = async () => { if (!INSPECTANNUALLY_ID) return; const resData = await getInspectAnnuallyView({ INSPECTANNUALLY_ID }); form.value = resData.pd; + console.log("-=-=-=-", form.value); const listData = await getTrailerList({ TRAFFIC_TYPE: form.value.VEHICLE_MODEL, }); diff --git a/src/views/mechanical_files/inspect_annually/index.vue b/src/views/mechanical_files/inspect_annually/index.vue index a4f86ce..a4293b3 100644 --- a/src/views/mechanical_files/inspect_annually/index.vue +++ b/src/views/mechanical_files/inspect_annually/index.vue @@ -9,17 +9,23 @@ - + - + - + @@ -29,6 +35,7 @@ value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="date" + placeholder="请选择到期日期" /> @@ -70,7 +77,7 @@ - 搜索 + 搜索 重置 @@ -129,12 +136,24 @@ + + + - diff --git a/src/views/mechanical_files/insure/index.vue b/src/views/mechanical_files/insure/index.vue index 271df49..526c478 100644 --- a/src/views/mechanical_files/insure/index.vue +++ b/src/views/mechanical_files/insure/index.vue @@ -9,17 +9,23 @@ - + - + - + @@ -29,6 +35,7 @@ value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="date" + placeholder="请选择到期日期" /> @@ -75,6 +82,7 @@ type="year" value-format="YYYY" format="YYYY" + placeholder="请选择保险年份" /> @@ -147,9 +155,15 @@ diff --git a/src/views/mechanical_files/maintenance/add.vue b/src/views/mechanical_files/maintenance/add.vue index 54673b8..da4e526 100644 --- a/src/views/mechanical_files/maintenance/add.vue +++ b/src/views/mechanical_files/maintenance/add.vue @@ -6,8 +6,8 @@ 车辆选择 - - + + diff --git a/src/views/mechanical_files/operations/add.vue b/src/views/mechanical_files/operations/add.vue index 201b31a..ac47ee3 100644 --- a/src/views/mechanical_files/operations/add.vue +++ b/src/views/mechanical_files/operations/add.vue @@ -18,8 +18,8 @@ - - + + - + - + - + @@ -29,6 +35,7 @@ value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="date" + placeholder="请选择到期日期" /> @@ -110,14 +117,12 @@ - + + + + diff --git a/src/views/troubleshooting_statistics/day_inspection/inspection_records.vue b/src/views/troubleshooting_statistics/day_inspection/inspection_records.vue new file mode 100644 index 0000000..0c57621 --- /dev/null +++ b/src/views/troubleshooting_statistics/day_inspection/inspection_records.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/src/views/troubleshooting_statistics/ten_day_inspection/index.vue b/src/views/troubleshooting_statistics/ten_day_inspection/index.vue new file mode 100644 index 0000000..e1d9531 --- /dev/null +++ b/src/views/troubleshooting_statistics/ten_day_inspection/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/troubleshooting_statistics/ten_day_inspection/inspection_records.vue b/src/views/troubleshooting_statistics/ten_day_inspection/inspection_records.vue new file mode 100644 index 0000000..ac74dcb --- /dev/null +++ b/src/views/troubleshooting_statistics/ten_day_inspection/inspection_records.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/troubleshooting_statistics/week_inspection/index.vue b/src/views/troubleshooting_statistics/week_inspection/index.vue new file mode 100644 index 0000000..54d40aa --- /dev/null +++ b/src/views/troubleshooting_statistics/week_inspection/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/troubleshooting_statistics/week_inspection/inspection_records.vue b/src/views/troubleshooting_statistics/week_inspection/inspection_records.vue new file mode 100644 index 0000000..aebf2c5 --- /dev/null +++ b/src/views/troubleshooting_statistics/week_inspection/inspection_records.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/workforce_management/components/add_one.vue b/src/views/workforce_management/components/add_one.vue new file mode 100644 index 0000000..7c8b8ad --- /dev/null +++ b/src/views/workforce_management/components/add_one.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/views/workforce_management/components/add_two.vue b/src/views/workforce_management/components/add_two.vue new file mode 100644 index 0000000..c9acf59 --- /dev/null +++ b/src/views/workforce_management/components/add_two.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/workforce_management/components/view.vue b/src/views/workforce_management/components/view.vue new file mode 100644 index 0000000..cb9d98b --- /dev/null +++ b/src/views/workforce_management/components/view.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/views/workforce_management/index.vue b/src/views/workforce_management/index.vue new file mode 100644 index 0000000..a1c6b2b --- /dev/null +++ b/src/views/workforce_management/index.vue @@ -0,0 +1,251 @@ + + + + + From df72d063326b979377a859a816f16c8ade53dc1a Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 8 Apr 2024 18:02:34 +0800 Subject: [PATCH 13/64] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/safety_production_related.js | 6 ++++++ src/request/traffic_occupational_hazards.js | 3 +++ src/request/traffic_safety_production.js | 4 ++++ .../operation_vehicle/add.vue | 4 ++-- .../operation_vehicle/edit.vue | 4 ++-- .../operation_vehicle/view.vue | 8 ++----- src/views/occupational_hazards/details.vue | 4 ++-- .../firefightingmaintain.vue | 21 +++++++++++++++++-- .../management_agreement/components/add.vue | 1 - .../management_agreement/index.vue | 4 ++-- .../violation_registration/add.vue | 15 ++++++------- .../safety_activities/components/add.vue | 2 +- .../safety_manual/components/add.vue | 2 +- src/views/safety_production/index.vue | 9 ++++---- .../course_management/view.vue | 4 +++- 15 files changed, 60 insertions(+), 31 deletions(-) diff --git a/src/request/safety_production_related.js b/src/request/safety_production_related.js index 2000a2e..0aff50f 100644 --- a/src/request/safety_production_related.js +++ b/src/request/safety_production_related.js @@ -29,6 +29,10 @@ export const layoutFnGetNotificationsClassification = async () => { return ref(resData); }; +// 获取交通处罚从业人员列表 +export const getTrafficPenaltyUserList = (params) => + post("/user/getTrafficPenaltyUserList", params); + // 从业类型（人员类型） export const layoutFnGetSIGNEDSTATUSClassification = async () => { const resData = await getLevelsByObject({ @@ -36,4 +40,6 @@ export const layoutFnGetSIGNEDSTATUSClassification = async () => { BIANMA: "TRAFFIC_EMPLOYMENT", }); return ref(resData); + + }; diff --git a/src/request/traffic_occupational_hazards.js b/src/request/traffic_occupational_hazards.js index 83647d8..c59dbda 100644 --- a/src/request/traffic_occupational_hazards.js +++ b/src/request/traffic_occupational_hazards.js @@ -14,3 +14,6 @@ export const infoOccupationalHazardsView = (params) => export const deleteOccupationalHazardsView = (params) => post("/occupationalhazards/delete", params); // 删除 岗位安全责任书 + +export const getSafetyOccupationalHazardsEdit = (params) => + upload("/occupationalhazards/getSafetyOccupationalHazardsEdit", params); // 详情 职业危害告知书 diff --git a/src/request/traffic_safety_production.js b/src/request/traffic_safety_production.js index aee9169..656998e 100644 --- a/src/request/traffic_safety_production.js +++ b/src/request/traffic_safety_production.js @@ -11,3 +11,7 @@ export const infoProductionView = (params) => export const deleteProductionView = (params) => upload("/production/delete", params); // 删除 安全生产目标 + + +export const getSafetyProductionEdit = (params) => + upload("/production/getSafetyProductionEdit", params); // 详情 安全生产目标 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 a06223a..42815c3 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 @@ -550,7 +550,7 @@ const fnSubmit = debounce( await fnUploadImage( currentOperatingVehicleId, form.value.DRIVINGLICENSE_PHOTO[i].raw, - 131 + 121 ); } } @@ -559,7 +559,7 @@ const fnSubmit = debounce( await fnUploadImage( currentOperatingVehicleId, form.value.OPERATING_CERTIFICATE_PHOTO[i].raw, - 132 + 122 ); } } 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 aec1834..2cb94e4 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 @@ -521,7 +521,7 @@ const fnSubmit = debounce( await fnUploadImage( currentOperatingVehicleId, form.value.DRIVINGLICENSE_PHOTO[i].raw, - 131 + 121 ); } } @@ -530,7 +530,7 @@ const fnSubmit = debounce( await fnUploadImage( currentOperatingVehicleId, form.value.OPERATING_CERTIFICATE_PHOTO[i].raw, - 132 + 122 ); } } diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue index 28b6d3d..41f3023 100644 --- a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue +++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue @@ -160,12 +160,8 @@ const fnGetData = async () => { const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID }); info.value = resData.pd; info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto); - info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile( - resData.drivinglicensephoto - ); - info.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile( - resData.operatingcertificatephoto - ); + info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile(resData.drivinglicensephoto); + info.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile(resData.operatingcertificatephoto); }; fnGetData(); diff --git a/src/views/occupational_hazards/details.vue b/src/views/occupational_hazards/details.vue index 7b67e84..0b9307f 100644 --- a/src/views/occupational_hazards/details.vue +++ b/src/views/occupational_hazards/details.vue @@ -111,7 +111,7 @@ import Add from "@/views/occupational_hazards/components/add.vue"; import LayoutPdf from "@/components/pdf/index.vue"; import { deleteOccupationalHazardsView, - getSafetyOccupationalHazardsList, + getSafetyOccupationalHazardsEdit, getSafetyOccupationalHazardsUserList, } from "@/request/traffic_occupational_hazards.js"; @@ -155,7 +155,7 @@ const fnAddOrEdit = async ( data.addOrEditDialog.type = type; data.addOrEditDialog.form = {}; if (type === "edit" && OCCUPATIONALHAZARDS_ID) { - const resData = await getSafetyOccupationalHazardsList({ + const resData = await getSafetyOccupationalHazardsEdit({ OCCUPATIONALHAZARDS_ID, }); if (resData && resData.varList && resData.varList.length > 0) { diff --git a/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue b/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue index f456c03..0974d35 100644 --- a/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue +++ b/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue @@ -2,6 +2,9 @@ 基本信息 + + {{ data.FACILITY_NUMBER }} + {{ data.FACILITY_NAME }} @@ -20,6 +23,18 @@ {{ data.REGISTRATION_TIME }} + + + 保养记录 @@ -84,15 +99,17 @@ import useListData from "@/assets/js/useListData.js"; import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js"; import { debounce } from "throttle-debounce"; import { ElMessage, ElMessageBox } from "element-plus"; +import { addingPrefixToFile } from "@/assets/js/utils.js"; const route = useRoute(); const router = useRouter(); const { FIREFIGHTINGFACILITY_ID } = route.query; const data = ref({}); const getData = async () => { - const { pd } = await getFirefightingEquipmentFacilityView({ + const resData = await getFirefightingEquipmentFacilityView({ FIREFIGHTINGFACILITY_ID, }); - data.value = pd; + data.value = resData.pd; + data.value.Images = addingPrefixToFile(resData.firefightingequipmentImg); }; getData(); const { list, fnResetPagination } = useListData(getMaintainFindFirefightingId, { diff --git a/src/views/production_course_regulate/management_agreement/components/add.vue b/src/views/production_course_regulate/management_agreement/components/add.vue index e8cdb28..66a9980 100644 --- a/src/views/production_course_regulate/management_agreement/components/add.vue +++ b/src/views/production_course_regulate/management_agreement/components/add.vue @@ -6,7 +6,6 @@ > diff --git a/src/views/production_course_regulate/management_agreement/index.vue b/src/views/production_course_regulate/management_agreement/index.vue index ffdbfee..75a26af 100644 --- a/src/views/production_course_regulate/management_agreement/index.vue +++ b/src/views/production_course_regulate/management_agreement/index.vue @@ -65,8 +65,8 @@ diff --git a/src/views/production_course_regulate/violation_registration/add.vue b/src/views/production_course_regulate/violation_registration/add.vue index 2eb8290..e904303 100644 --- a/src/views/production_course_regulate/violation_registration/add.vue +++ b/src/views/production_course_regulate/violation_registration/add.vue @@ -107,7 +107,7 @@ diff --git a/src/views/production_course_regulate/violation_registration/edit.vue b/src/views/production_course_regulate/violation_registration/edit.vue index 671701b..8d00591 100644 --- a/src/views/production_course_regulate/violation_registration/edit.vue +++ b/src/views/production_course_regulate/violation_registration/edit.vue @@ -105,7 +105,6 @@ diff --git a/src/views/enterprise_management/user_practitioner/details.vue b/src/views/enterprise_management/user_practitioner/details.vue index 17ec9f4..052a1b0 100644 --- a/src/views/enterprise_management/user_practitioner/details.vue +++ b/src/views/enterprise_management/user_practitioner/details.vue @@ -47,7 +47,7 @@ {{ data.info.WORKING_DATE }} - @@ -65,40 +65,38 @@ }} - + + + + + + { item.ID_PHOTO_FRONT = FILE_URL + item.ID_PHOTO_FRONT; if (item.ID_PHOTO_BACK) { @@ -186,11 +183,11 @@ const fnGetData = async () => { }); data.certificateList = resData.certificateList; data.certificateList.forEach((item) => { - if(!item.ID_PHOTO_FRONT || item.ID_PHOTO_FRONT.includes("undefined")) { - item.ID_PHOTO_FRONT = null + if (!item.ID_PHOTO_FRONT || item.ID_PHOTO_FRONT.includes("undefined")) { + item.ID_PHOTO_FRONT = null; } - if(!item.ID_PHOTO_BACK) { - item.ID_PHOTO_BACK = null + if (!item.ID_PHOTO_BACK) { + item.ID_PHOTO_BACK = null; } }); }; diff --git a/src/views/management_staffing/components/add.vue b/src/views/management_staffing/components/add.vue index 7996bf1..27f31be 100644 --- a/src/views/management_staffing/components/add.vue +++ b/src/views/management_staffing/components/add.vue @@ -101,7 +101,9 @@ const { visible, form } = useVModels(props, emits); const rules = { file: [{ required: true, message: "请上传附件", trigger: "change" }], SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }], - EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }], + EXPIRYDATE: [ + { required: true, message: "请选择到期时间", trigger: "change" }, + ], }; const operatingCompany = ref(""); diff --git a/src/views/mechanical_files/assigned_manage/add.vue b/src/views/mechanical_files/assigned_manage/add.vue index 12c53f4..ab67e82 100644 --- a/src/views/mechanical_files/assigned_manage/add.vue +++ b/src/views/mechanical_files/assigned_manage/add.vue @@ -413,7 +413,10 @@ const fnEditVehicleModel = async () => { const fnGetVehicleInfo = async () => { if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") { for (let i = 0; i < form.value.OPERATIONVEHICLELIST.length; i++) { - if (form.value.OPERATIONVEHICLELIST[i].OPERATING_ID === form.value.VEHICLE_PLATE_NUMBER) { + if ( + form.value.OPERATIONVEHICLELIST[i].OPERATING_ID === + form.value.VEHICLE_PLATE_NUMBER + ) { const OPERATING_ID = form.value.OPERATIONVEHICLELIST[i].OPERATING_ID; const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID }); info.value = resData.pd; diff --git a/src/views/mechanical_files/assigned_manage/index.vue b/src/views/mechanical_files/assigned_manage/index.vue index 17402e1..6e87f8a 100644 --- a/src/views/mechanical_files/assigned_manage/index.vue +++ b/src/views/mechanical_files/assigned_manage/index.vue @@ -208,7 +208,6 @@ import { debounce } from "throttle-debounce"; import { ElMessage, ElMessageBox } from "element-plus"; import { onMounted, ref } from "vue"; -console.log("-=-=-=-=-=", await getAssignedList()); const router = useRouter(); const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getAssignedList, {}); diff --git a/src/views/mechanical_files/beidou/index.vue b/src/views/mechanical_files/beidou/index.vue index 5715638..88ba097 100644 --- a/src/views/mechanical_files/beidou/index.vue +++ b/src/views/mechanical_files/beidou/index.vue @@ -102,25 +102,35 @@ diff --git a/src/views/mechanical_files/inspect_annually/add.vue b/src/views/mechanical_files/inspect_annually/add.vue index b815ba0..95bb69f 100644 --- a/src/views/mechanical_files/inspect_annually/add.vue +++ b/src/views/mechanical_files/inspect_annually/add.vue @@ -414,7 +414,6 @@ const fnGetData = async () => { if (!INSPECTANNUALLY_ID) return; const resData = await getInspectAnnuallyView({ INSPECTANNUALLY_ID }); form.value = resData.pd; - console.log("-==-=--=",form.value); const listData = await getTrailerList({ TRAFFIC_TYPE: form.value.VEHICLE_MODEL, }); diff --git a/src/views/mechanical_files/inspect_annually/edit.vue b/src/views/mechanical_files/inspect_annually/edit.vue index 0e60588..d8f2f83 100644 --- a/src/views/mechanical_files/inspect_annually/edit.vue +++ b/src/views/mechanical_files/inspect_annually/edit.vue @@ -393,7 +393,6 @@ const fnGetData = async () => { if (!INSPECTANNUALLY_ID) return; const resData = await getInspectAnnuallyView({ INSPECTANNUALLY_ID }); form.value = resData.pd; - console.log("-=-=-=-", form.value); const listData = await getTrailerList({ TRAFFIC_TYPE: form.value.VEHICLE_MODEL, }); diff --git a/src/views/mechanical_files/inspect_annually/index.vue b/src/views/mechanical_files/inspect_annually/index.vue index a4293b3..a79fd96 100644 --- a/src/views/mechanical_files/inspect_annually/index.vue +++ b/src/views/mechanical_files/inspect_annually/index.vue @@ -9,22 +9,25 @@ - - - @@ -137,21 +140,25 @@ diff --git a/src/views/mechanical_files/insure/index.vue b/src/views/mechanical_files/insure/index.vue index 526c478..e531d13 100644 --- a/src/views/mechanical_files/insure/index.vue +++ b/src/views/mechanical_files/insure/index.vue @@ -9,22 +9,25 @@ - - - @@ -146,23 +149,23 @@ diff --git a/src/views/mechanical_files/maintenance/index.vue b/src/views/mechanical_files/maintenance/index.vue index f0aa673..239b23d 100644 --- a/src/views/mechanical_files/maintenance/index.vue +++ b/src/views/mechanical_files/maintenance/index.vue @@ -109,31 +109,35 @@ diff --git a/src/views/mechanical_files/operations/index.vue b/src/views/mechanical_files/operations/index.vue index 18ec762..adf853e 100644 --- a/src/views/mechanical_files/operations/index.vue +++ b/src/views/mechanical_files/operations/index.vue @@ -9,22 +9,25 @@ - - - @@ -147,8 +150,12 @@ diff --git a/src/views/mechanical_files/operations/view.vue b/src/views/mechanical_files/operations/view.vue index d112f20..d54166a 100644 --- a/src/views/mechanical_files/operations/view.vue +++ b/src/views/mechanical_files/operations/view.vue @@ -126,7 +126,6 @@ const fnGetData = async () => { if (!OPERATIONS_ID) return; const resData = await getOperationsView(OPERATIONS_ID); info.value = resData.pd; - console.log("-==-=-=--=",info.value); info.value.OPERATIONSINFO = []; fnBusChange(resData.pd.VEHICLE); info.value.OPERATIONSINFO = addingPrefixToFile(resData.operationsinfoImgs); diff --git a/src/views/mechanical_files/production_accident/add.vue b/src/views/mechanical_files/production_accident/add.vue index 3150e69..bf355b5 100644 --- a/src/views/mechanical_files/production_accident/add.vue +++ b/src/views/mechanical_files/production_accident/add.vue @@ -413,7 +413,7 @@ import { infoAccidentInvestigation, } from "@/request/production_accident.js"; import { addingPrefixFile } from "@/assets/js/utils.js"; -import {getUserSelectListAll} from "@/request/user_practitioner.js"; +import { getUserSelectListAll } from "@/request/user_practitioner.js"; // 获取路由实例 const route = useRoute(); diff --git a/src/views/mechanical_files/production_accident/index.vue b/src/views/mechanical_files/production_accident/index.vue index 807e9dc..d09180e 100644 --- a/src/views/mechanical_files/production_accident/index.vue +++ b/src/views/mechanical_files/production_accident/index.vue @@ -120,7 +120,7 @@ import { setAccidentInvestigationDelete, } from "@/request/production_accident.js"; import { ACCIDENTNATUREMENU } from "@/assets/js/constant.js"; -import {getUserSelectListAll} from "@/request/user_practitioner.js"; +import { getUserSelectListAll } from "@/request/user_practitioner.js"; const router = useRouter(); const fnGetUnitsList = async () => { diff --git a/src/views/mechanical_files/taxation_manage/index.vue b/src/views/mechanical_files/taxation_manage/index.vue index 11091e4..df36f96 100644 --- a/src/views/mechanical_files/taxation_manage/index.vue +++ b/src/views/mechanical_files/taxation_manage/index.vue @@ -110,31 +110,35 @@ diff --git a/src/views/production_course_regulate/management_agreement/components/add.vue b/src/views/production_course_regulate/management_agreement/components/add.vue index 66a9980..12053c2 100644 --- a/src/views/production_course_regulate/management_agreement/components/add.vue +++ b/src/views/production_course_regulate/management_agreement/components/add.vue @@ -5,10 +5,7 @@ :before-close="fnClose" > - + diff --git a/src/views/production_course_regulate/violation_registration/index.vue b/src/views/production_course_regulate/violation_registration/index.vue index 689725b..010fa73 100644 --- a/src/views/production_course_regulate/violation_registration/index.vue +++ b/src/views/production_course_regulate/violation_registration/index.vue @@ -120,7 +120,7 @@ import { getViolationRegistrationList, setViolationRegistrationDelete, } from "@/request/violation_registration.js"; -import {getUserSelectListAll} from "@/request/user_practitioner.js"; +import { getUserSelectListAll } from "@/request/user_practitioner.js"; const router = useRouter(); const convertTransportVehicle = (name) => { diff --git a/src/views/safety_assessment/components/add.vue b/src/views/safety_assessment/components/add.vue index 7ddfc68..cec77d9 100644 --- a/src/views/safety_assessment/components/add.vue +++ b/src/views/safety_assessment/components/add.vue @@ -89,7 +89,9 @@ const { visible, form } = useVModels(props, emits); const rules = { file: [{ required: true, message: "请上传附件", trigger: "change" }], SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }], - EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }], + EXPIRYDATE: [ + { required: true, message: "请选择到期时间", trigger: "change" }, + ], }; const operatingCompany = ref(""); diff --git a/src/views/safety_production/components/add.vue b/src/views/safety_production/components/add.vue index 7c3e539..76083a3 100644 --- a/src/views/safety_production/components/add.vue +++ b/src/views/safety_production/components/add.vue @@ -88,7 +88,9 @@ const { visible, form } = useVModels(props, emits); const rules = { file: [{ required: true, message: "请上传附件", trigger: "change" }], SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }], - EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }], + EXPIRYDATE: [ + { required: true, message: "请选择到期时间", trigger: "change" }, + ], }; const formRef = ref(null); diff --git a/src/views/safety_production_related/driving_log/add.vue b/src/views/safety_production_related/driving_log/add.vue index ef088ed..f252f65 100644 --- a/src/views/safety_production_related/driving_log/add.vue +++ b/src/views/safety_production_related/driving_log/add.vue @@ -119,7 +119,6 @@ import LayoutUpload from "@/components/upload/index.vue"; import LayoutEditor from "@/components/editor/index.vue"; import useFormValidate from "@/assets/js/useFormValidate.js"; import { ElMessage } from "element-plus"; -import {getUserSelectListAll} from "@/request/user_practitioner.js"; const formRef = ref(null); const cities = [ "驾驶员", diff --git a/src/views/safety_production_related/safety_meeting/add.vue b/src/views/safety_production_related/safety_meeting/add.vue index 551254a..e75e2e5 100644 --- a/src/views/safety_production_related/safety_meeting/add.vue +++ b/src/views/safety_production_related/safety_meeting/add.vue @@ -148,7 +148,6 @@ import useFormValidate from "@/assets/js/useFormValidate.js"; import { ElMessage } from "element-plus"; import SelectPerson from "@/views/safety_production_related/security_notice/components/select_person.vue"; import { useRouter } from "vue-router"; -import { getUserSelectListAll } from "@/request/user_practitioner.js"; const formRef = ref(null); const rules = { MEETING_TITLE: [ diff --git a/src/views/security_commitment/components/add.vue b/src/views/security_commitment/components/add.vue index a49e1c6..5af24bc 100644 --- a/src/views/security_commitment/components/add.vue +++ b/src/views/security_commitment/components/add.vue @@ -108,7 +108,7 @@ const rules = { ], EXPIRYDATE: [ { required: true, message: "请选择到期时间", trigger: "change" }, - ] + ], }; const formRef = ref(null); const fnClose = () => { diff --git a/src/views/security_commitment/details.vue b/src/views/security_commitment/details.vue index ee490fa..bf7c1e5 100644 --- a/src/views/security_commitment/details.vue +++ b/src/views/security_commitment/details.vue @@ -146,7 +146,11 @@ function fileName(path) { return path.split("/").pop(); } -const fnAddOrEdit = async (SECURITYCOMMITMENT_ID = "",USER_ID = "",type = "add") => { +const fnAddOrEdit = async ( + SECURITYCOMMITMENT_ID = "", + USER_ID = "", + type = "add" +) => { data.addOrEditDialog.visible = true; data.addOrEditDialog.type = type; if (type === "edit" && SECURITYCOMMITMENT_ID && USER_ID) { From ba03a2fa122db0666e575fd6e31e6f5b86226e18 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 9 Apr 2024 16:07:52 +0800 Subject: [PATCH 17/64] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/map.js | 23 ------------------- .../semester/components/review.vue | 2 +- .../education_user/review_user/index.vue | 2 +- src/views/education_user/sign_user/index.vue | 2 +- .../waybill_registration/index.vue | 2 +- .../department/index.vue | 2 +- .../electronic_fence/index.vue | 2 +- .../industry_qualifications/index.vue | 2 +- .../enterprise_management/user/index.vue | 2 +- .../inspection_record.vue | 2 +- .../inspection_record/index.vue | 2 +- .../inventory_troubleshooting/inspect.vue | 2 +- .../inspect_custom.vue | 2 +- .../hidden_danger_government/ledger/index.vue | 2 +- src/views/labor_contract/index.vue | 8 +++---- src/views/management_staffing/index.vue | 8 +++---- src/views/mechanical_files/beidou/index.vue | 7 +----- src/views/mechanical_files/insure/index.vue | 7 +----- .../mechanical_files/maintenance/index.vue | 2 +- .../mechanical_files/operations/index.vue | 2 +- .../mechanical_files/scrap_manage/index.vue | 2 +- .../notification_announcement/index.vue | 2 +- src/views/occupational_hazards/index.vue | 8 +++---- .../index.vue | 2 +- .../entrench_thing_grant/index.vue | 2 +- .../firefightingmaintain.vue | 2 +- .../firefighting_equipment_facility/index.vue | 2 +- .../management_agreement/index.vue | 2 +- .../production_equipment_facility/index.vue | 2 +- .../maintain.vue | 2 +- .../reported_incident_dispose/index.vue | 2 +- .../risk_control/identifying_parts/index.vue | 2 +- src/views/risk_control/ledger/index.vue | 2 +- src/views/risk_control/risk_point/index.vue | 2 +- .../risk_four_color_chart/index.vue | 2 +- src/views/safety_assessment/index.vue | 8 +++---- .../safety_activities/index.vue | 2 +- .../safety_culture/safety_manual/index.vue | 2 +- src/views/safety_production/index.vue | 8 +++---- src/views/safety_responsibility/index.vue | 8 +++---- src/views/security_commitment/index.vue | 8 +++---- .../system_documents/index.vue | 2 +- .../components/list.vue | 2 +- .../components/curriculum.vue | 2 +- .../class_management/index.vue | 2 +- .../exam_paper_management/add.vue | 5 +++- .../exam_paper_management/index.vue | 2 +- .../examdraft_management/edit.vue | 5 +++- .../examdraft_management/index.vue | 4 +++- .../course_management/add.vue | 4 ++-- .../components/add_courseware.vue | 4 ++-- .../course_management/index.vue | 2 +- src/views/workforce_management/index.vue | 2 +- 53 files changed, 83 insertions(+), 108 deletions(-) delete mode 100644 src/request/map.js diff --git a/src/request/map.js b/src/request/map.js deleted file mode 100644 index 5ec409e..0000000 --- a/src/request/map.js +++ /dev/null @@ -1,23 +0,0 @@ -import { post } from "./axios"; - -export const getRealTimeList = (params) => post("/map/getRealTimeList", params); // 获取在线人员列表 -export const getFenceList = (params) => post("/map/getFenceList", params); // 获取围栏列表 -export const getPersonnelTrajectories = (params) => - post("/map/getPersonnelTrajectories", params); // 获取拥有历史轨迹的全部角色 - -export const getCharacterTrajectories = (params) => - post("/map/getCharacterTrajectories", params); // 获取轨迹 -export const getUserByCardNo = (params) => - post("/user/getUserByCardNo", params); - -export const getEightWorks = (params) => post("/map/getEightWorks", params); - -export const getHotworkList = (params) => post("/map/getHotworkList", params); -export const getEightWorksByType = (params) => - post("/map/getEightWorksByType", params); -export const getCameraList = (params) => post("/map/getCameraList", params); - -export const getConfinedspaceWorkList = (params) => - post("/map/getConfinedspaceWorkList", params); - -export const getHighWorkList = (params) => post("/map/getHighWorkList", params); diff --git a/src/views/archives_management/semester/components/review.vue b/src/views/archives_management/semester/components/review.vue index cf3ab3d..8ac90d5 100644 --- a/src/views/archives_management/semester/components/review.vue +++ b/src/views/archives_management/semester/components/review.vue @@ -86,7 +86,7 @@ - - - + + From db057467b26509f56d4bfbc857f2cfdb70247984 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 9 Apr 2024 21:52:02 +0800 Subject: [PATCH 19/64] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9B=BF=E6=8D=A2CORPI?= =?UTF-8?q?NFO=5FID=E9=80=9A=E7=94=A8=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/customer_management.js | 5 +++- src/request/location_management.js | 3 ++ src/request/waybill_registration.js | 3 -- .../customer_management/add.vue | 10 +------ .../customer_management/index.vue | 30 ++----------------- .../location_managemen/add.vue | 16 +++------- .../location_managemen/index.vue | 30 ++----------------- .../waybill_registration/add.vue | 18 ++++------- .../freight_trailer/index.vue | 5 ++-- .../operation_vehicle/index.vue | 5 ++-- .../assigned_manage/index.vue | 4 +-- src/views/mechanical_files/beidou/index.vue | 5 ++-- .../inspect_annually/index.vue | 5 ++-- src/views/mechanical_files/insure/index.vue | 5 ++-- .../mechanical_files/maintenance/add.vue | 29 +++++++++++------- .../mechanical_files/maintenance/edit.vue | 6 +++- .../mechanical_files/maintenance/index.vue | 5 ++-- .../mechanical_files/operations/index.vue | 5 ++-- .../production_accident/add.vue | 7 +++-- .../mechanical_files/scrap_manage/index.vue | 4 +-- .../taxation_manage/index.vue | 4 +-- .../management_agreement/components/add.vue | 1 + .../safety_meeting/meeting_info.vue | 2 +- .../security_notice/add.vue | 14 ++------- .../security_notice/details.vue | 28 ++++++----------- .../security_notice/index.vue | 12 ++++---- .../security_notice/notice_info.vue | 2 +- 27 files changed, 98 insertions(+), 165 deletions(-) diff --git a/src/request/customer_management.js b/src/request/customer_management.js index dc79979..4455f66 100644 --- a/src/request/customer_management.js +++ b/src/request/customer_management.js @@ -1,10 +1,13 @@ import { post, upload } from "@/request/axios.js"; export const getSecurityCustomerList = (params) => - post("/securitycustomer/listForSecurityCustomerManagement", params); // 客户管理列表 + post("/securitycustomer/listForSecurityCustomerManagement", params); // 客户管理列表（table） export const addSafetyCustomerView = (params) => upload("/securitycustomer/add", params); // 添加 export const deleteSafetyCustomerView = (params) => upload("/securitycustomer/delete", params); // 删除 + +export const getTrafficCustomerSelectList = (params) => + post("/securitycustomer/getTrafficCustomerSelectList", params); // 客户管理列表（list） diff --git a/src/request/location_management.js b/src/request/location_management.js index 699e05d..44c01ef 100644 --- a/src/request/location_management.js +++ b/src/request/location_management.js @@ -8,3 +8,6 @@ export const addSafetyLocationView = (params) => export const deleteSafetyLocationView = (params) => post("/securitylocation/delete", params); // 添加地段管理 + +export const getTrafficLocationSelectList = (params) => + post("/securitylocation/getTrafficLocationSelectList", params); // 地点管理列表 diff --git a/src/request/waybill_registration.js b/src/request/waybill_registration.js index 716821d..52e3928 100644 --- a/src/request/waybill_registration.js +++ b/src/request/waybill_registration.js @@ -3,9 +3,6 @@ import { post, upload } from "@/request/axios.js"; export const getSecurityWaybillreList = (params) => post("/waybillregistration/listForSecurityWaybillre", params); // 运单登记列表 -export const getSecurityPerson = (params) => - post("/waybillregistration/forSecurityPerson", params); - export const addSafetyWaybillreView = (params) => upload("/waybillregistration/add", params); // 添加运单登记 diff --git a/src/views/electronic_waybill_management/customer_management/add.vue b/src/views/electronic_waybill_management/customer_management/add.vue index e72f639..53b0a0f 100644 --- a/src/views/electronic_waybill_management/customer_management/add.vue +++ b/src/views/electronic_waybill_management/customer_management/add.vue @@ -104,8 +104,7 @@ + + diff --git a/src/views/security_investment/extraction_and_use/index.vue b/src/views/security_investment/extraction_and_use/index.vue new file mode 100644 index 0000000..82d4c7b --- /dev/null +++ b/src/views/security_investment/extraction_and_use/index.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/src/views/security_investment/plan/components/add.vue b/src/views/security_investment/plan/components/add.vue new file mode 100644 index 0000000..ebacb08 --- /dev/null +++ b/src/views/security_investment/plan/components/add.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/src/views/security_investment/plan/components/view.vue b/src/views/security_investment/plan/components/view.vue new file mode 100644 index 0000000..419649a --- /dev/null +++ b/src/views/security_investment/plan/components/view.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/views/security_investment/plan/index.vue b/src/views/security_investment/plan/index.vue new file mode 100644 index 0000000..480057a --- /dev/null +++ b/src/views/security_investment/plan/index.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/src/views/security_investment/plan_review/index.vue b/src/views/security_investment/plan_review/index.vue new file mode 100644 index 0000000..5666204 --- /dev/null +++ b/src/views/security_investment/plan_review/index.vue @@ -0,0 +1,155 @@ + + + + + From ae3cba5fb87723b710ce3bb8f0286401dfefaf45 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 10 Apr 2024 16:53:36 +0800 Subject: [PATCH 21/64] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/constant.js | 1 + src/request/data_dictionary.js | 2 +- src/request/safety_production_related.js | 2 +- src/request/scrap_manage.js | 2 +- src/views/mechanical_files/beidou/index.vue | 22 +++++----- .../inspect_annually/index.vue | 2 +- src/views/mechanical_files/insure/index.vue | 30 +++++++------- .../mechanical_files/maintenance/index.vue | 22 +++++----- .../mechanical_files/operations/index.vue | 18 ++++---- .../mechanical_files/scrap_manage/add.vue | 16 ++++---- .../security_notice/add.vue | 17 ++++---- .../components/select_person.vue | 5 ++- .../security_notice/details.vue | 23 ++++++----- .../security_notice/index.vue | 41 ++++++++----------- .../security_notice/notice_info.vue | 2 +- 15 files changed, 100 insertions(+), 105 deletions(-) diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js index db31fd3..eded5e4 100644 --- a/src/assets/js/constant.js +++ b/src/assets/js/constant.js @@ -139,6 +139,7 @@ export const REMIND_DAYS = [ { ID: "2", NAME: "90天", NUM: "90" }, ]; + // export const MAINTENANCE_LEVEL_LIST = [ // //维保等级 // {ID:'1',NAME:'一级维保'}, diff --git a/src/request/data_dictionary.js b/src/request/data_dictionary.js index 1d54e86..74a4d15 100644 --- a/src/request/data_dictionary.js +++ b/src/request/data_dictionary.js @@ -29,7 +29,7 @@ export const getLevelsCorp = (params) => }); // 获取数据字典 export const getLevelsByParentId = (params) => - post("/dictionaries/listDictToParId", { + post("/dictionaries/getLevels", { loading: false, ...params, }); diff --git a/src/request/safety_production_related.js b/src/request/safety_production_related.js index 3c81300..d8af733 100644 --- a/src/request/safety_production_related.js +++ b/src/request/safety_production_related.js @@ -29,7 +29,7 @@ export const issueSecurityNotice = (params) => // 通知等级 export const layoutFnGetNotificationsClassification = async () => { const resData = await getLevelsByParentId({ - parentId: "aaecb47d95524b84904809671e48a777", + DICTIONARIES_ID: "aaaecb47d95524b84904809671e48a656", }); return ref(resData); }; diff --git a/src/request/scrap_manage.js b/src/request/scrap_manage.js index 4b16304..35effb3 100644 --- a/src/request/scrap_manage.js +++ b/src/request/scrap_manage.js @@ -4,7 +4,7 @@ import { post, upload } from "@/request/axios.js"; export const layoutFnGetScrapType = async () => { const resData = await getLevelsByParentId({ - parentId: "78452f4ec77e4d98ae8cdd9c3386ae0c", + DICTIONARIES_ID: "78452f4ec77e4d98ae8cdd9c3386ae0c", }); return ref(resData); }; diff --git a/src/views/mechanical_files/beidou/index.vue b/src/views/mechanical_files/beidou/index.vue index 6f09cf0..38c8704 100644 --- a/src/views/mechanical_files/beidou/index.vue +++ b/src/views/mechanical_files/beidou/index.vue @@ -87,19 +87,19 @@ - - - + + + - - - + + + - + - + - + - - - + - - + + - - - + + + - - - - + + + + - + - + - - + + + + + diff --git a/src/views/electronic_waybill_management/waybill_registration/index.vue b/src/views/electronic_waybill_management/waybill_registration/index.vue index a30b00f..4eee731 100644 --- a/src/views/electronic_waybill_management/waybill_registration/index.vue +++ b/src/views/electronic_waybill_management/waybill_registration/index.vue @@ -67,6 +67,19 @@ @@ -249,6 +252,15 @@ const fnSubmitLogin = async () => { right: 80px; } } + + .foot { + position: absolute; + width: 100%; + text-align: center; + bottom: 10px; + color: #fff; + font-size: 14px; + } } :deep { From f2e8d02867e16ce2ae92443caa625c30daf98e22 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Fri, 12 Apr 2024 10:26:05 +0800 Subject: [PATCH 31/64] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 2 +- env.d.ts | 27 +++++++++++++++++++++++++++ package-lock.json | 10 ++++++++++ package.json | 1 + src/vite-env.d.ts | 14 -------------- vite.config.js | 2 ++ 6 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 env.d.ts delete mode 100644 src/vite-env.d.ts diff --git a/.eslintignore b/.eslintignore index 32b17dc..7385d52 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,4 +2,4 @@ public dist package.json !.prettierrc.cjs -src/vite-env.d.ts +env.d.ts diff --git a/env.d.ts b/env.d.ts new file mode 100644 index 0000000..4e8bca1 --- /dev/null +++ b/env.d.ts @@ -0,0 +1,27 @@ +interface ImportMetaEnv { + // Auto generate by env-parse + /** + * undefined + */ + readonly VITE_BASE_URL: string + /** + * undefined + */ + readonly VITE_PROXY: Record + /** + * undefined + */ + readonly VITE_FILE_URL: string + /** + * undefined + */ + readonly VITE_TEMPLATE_URL: string + /** + * undefined + */ + readonly VITE_ON_LINE_WEB_SOCKET_URL: string + /** + * undefined + */ + readonly VITE_LEARNING_WEB_SOCKET_URL: string +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7cc317a..ee2614a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,6 +68,7 @@ "unplugin-vue-components": "^0.22.12", "vite": "^4.5.1", "vite-plugin-enhance-log": "^0.5.2", + "vite-plugin-env-parse": "^1.0.10", "vite-plugin-eslint": "^1.8.1", "vite-plugin-remove-console": "^2.2.0", "vue-eslint-parser": "^9.3.2" @@ -5966,6 +5967,15 @@ "vite": "^2.9.0 || ^3.0.0 || ^4.0.0" } }, + "node_modules/vite-plugin-env-parse": { + "version": "1.0.10", + "resolved": "https://registry.npmmirror.com/vite-plugin-env-parse/-/vite-plugin-env-parse-1.0.10.tgz", + "integrity": "sha512-7C3ixNz02ExrYCZRkAhXRWXqWktR/YO/SkrCdOUFR3GCXALUGt4xNhTTVZonKH8SpA4xe1wp2mS606MKZdvOpw==", + "dev": true, + "peerDependencies": { + "vite": "*" + } + }, "node_modules/vite-plugin-eslint": { "version": "1.8.1", "resolved": "https://registry.npmmirror.com/vite-plugin-eslint/-/vite-plugin-eslint-1.8.1.tgz", diff --git a/package.json b/package.json index 8bb9dbf..249ca3d 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "unplugin-vue-components": "^0.22.12", "vite": "^4.5.1", "vite-plugin-enhance-log": "^0.5.2", + "vite-plugin-env-parse": "^1.0.10", "vite-plugin-eslint": "^1.8.1", "vite-plugin-remove-console": "^2.2.0", "vue-eslint-parser": "^9.3.2" diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts deleted file mode 100644 index ef6964f..0000000 --- a/src/vite-env.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -/// - -interface ImportMetaEnv { - readonly VITE_BASE_URL: string - readonly VITE_PROXY: string - readonly VITE_FILE_URL: string - readonly VITE_TEMPLATE_URL: string - readonly VITE_ON_LINE_WEB_SOCKET_URL: string - readonly VITE_LEARNING_WEB_SOCKET_URL: string -} - -interface ImportMeta { - readonly env: ImportMetaEnv -} diff --git a/vite.config.js b/vite.config.js index 6790793..e178e6c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -10,11 +10,13 @@ import { // import basicSsl from "@vitejs/plugin-basic-ssl"; import removeConsole from "vite-plugin-remove-console"; import EnhanceLog from "vite-plugin-enhance-log"; +import { envParse } from "vite-plugin-env-parse"; export default ({ mode }) => { return defineConfig({ plugins: [ vue(), + envParse(), eslintPlugin(), removeConsole({ includes: [ From 9b8ad27e57e500de5ae9115cb29751868ef861e4 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Fri, 12 Apr 2024 11:08:15 +0800 Subject: [PATCH 32/64] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- .env.production | 2 +- env.d.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 6862a98..eb7630e 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ VITE_BASE_URL=http://192.168.0.49:8093/ -VITE_PROXY=/api/ +VITE_PROXY=/api VITE_FILE_URL=https://file.zcloudchina.com/YTHFile VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/ VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/ diff --git a/.env.production b/.env.production index fdbe314..975d3d4 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ VITE_BASE_URL=http://192.168.0.31:7082/integrated_traffic/ -VITE_PROXY=/api/ +VITE_PROXY=/api VITE_FILE_URL=https://file.zcloudchina.com/YTHFile VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/ VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/ diff --git a/env.d.ts b/env.d.ts index 4e8bca1..a6b6bbe 100644 --- a/env.d.ts +++ b/env.d.ts @@ -7,7 +7,7 @@ interface ImportMetaEnv { /** * undefined */ - readonly VITE_PROXY: Record + readonly VITE_PROXY: string /** * undefined */ From ea258a8e3b609bd87ef0ca91571d42d04d4b0c91 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Fri, 12 Apr 2024 11:21:20 +0800 Subject: [PATCH 33/64] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 +----- .env.development | 3 +++ .env.production | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.env b/.env index 6862a98..ca3c81c 100644 --- a/.env +++ b/.env @@ -1,7 +1,3 @@ -VITE_BASE_URL=http://192.168.0.49:8093/ -VITE_PROXY=/api/ +VITE_PROXY=/api VITE_FILE_URL=https://file.zcloudchina.com/YTHFile VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/ -VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/ -VITE_LEARNING_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/websocket/ - diff --git a/.env.development b/.env.development index e69de29..1252cf2 100644 --- a/.env.development +++ b/.env.development @@ -0,0 +1,3 @@ +VITE_BASE_URL=http://192.168.0.69:7082/ +VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/ +VITE_LEARNING_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/websocket/ diff --git a/.env.production b/.env.production index fdbe314..e120c4c 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,4 @@ VITE_BASE_URL=http://192.168.0.31:7082/integrated_traffic/ -VITE_PROXY=/api/ -VITE_FILE_URL=https://file.zcloudchina.com/YTHFile -VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/ VITE_ON_LINE_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/zxwebsocket/ VITE_LEARNING_WEB_SOCKET_URL=wss://qaaq.qhdsafety.com/websocket/ From 57487151d6ef0b8a668a415b33f94b8b8da64954 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 12 Apr 2024 18:04:26 +0800 Subject: [PATCH 34/64] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/customer_management.js | 6 + src/request/location_management.js | 6 + .../customer_management/edit.vue | 206 ++++++++++++++++++ .../customer_management/index.vue | 13 ++ .../location_managemen/add.vue | 10 +- .../location_managemen/edit.vue | 184 ++++++++++++++++ .../location_managemen/index.vue | 13 ++ .../waybill_registration/edit.vue | 9 - .../information/edit.vue | 1 + 9 files changed, 435 insertions(+), 13 deletions(-) create mode 100644 src/views/electronic_waybill_management/customer_management/edit.vue create mode 100644 src/views/electronic_waybill_management/location_managemen/edit.vue diff --git a/src/request/customer_management.js b/src/request/customer_management.js index 5a07e75..8530070 100644 --- a/src/request/customer_management.js +++ b/src/request/customer_management.js @@ -11,3 +11,9 @@ export const deleteSafetyCustomerView = (params) => export const getTrafficCustomerSelectList = (params) => post("/securitycustomer/getTrafficCustomerSelectList", params); // 客户管理列表（list） + +export const getTrafficCustomerSelectView = (params) => + post("/securitycustomer/getTrafficCustomerSelectView", params); // 获取客户管理的数据回显 + +export const editSafetyCustomerInfo = (params) => + upload("/securitycustomer/edit", params); // 添加 diff --git a/src/request/location_management.js b/src/request/location_management.js index a48b7f4..daa097c 100644 --- a/src/request/location_management.js +++ b/src/request/location_management.js @@ -11,3 +11,9 @@ export const deleteSafetyLocationView = (params) => export const getTrafficLocationSelectList = (params) => post("/securitylocation/getTrafficLocationSelectList", params); // 地点管理列表 + +export const getSecurityLocationView = (params) => + post("/securitylocation/goEdit", params); // 根据Id获取地点管理信息 + +export const editSafetyLocationInfo = (params) => + post("/securitylocation/edit", params); // 添加地段管理 diff --git a/src/views/electronic_waybill_management/customer_management/edit.vue b/src/views/electronic_waybill_management/customer_management/edit.vue new file mode 100644 index 0000000..ad70549 --- /dev/null +++ b/src/views/electronic_waybill_management/customer_management/edit.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/src/views/electronic_waybill_management/customer_management/index.vue b/src/views/electronic_waybill_management/customer_management/index.vue index 958d8f4..945bb70 100644 --- a/src/views/electronic_waybill_management/customer_management/index.vue +++ b/src/views/electronic_waybill_management/customer_management/index.vue @@ -58,6 +58,19 @@