wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

BUG 优化

dev
xiepeng 2024-04-08 18:02:34 +08:00
parent cabb170582
commit df72d06332
15 changed files with 60 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/request/safety_production_related.js
View File

@ -29,6 +29,10 @@ export const layoutFnGetNotificationsClassification = async () => {
return ref(resData); return ref(resData);
}; };
// 获取交通处罚从业人员列表
export const getTrafficPenaltyUserList = (params) =>
post("/user/getTrafficPenaltyUserList", params);
// 从业类型（人员类型） // 从业类型（人员类型）
export const layoutFnGetSIGNEDSTATUSClassification = async () => { export const layoutFnGetSIGNEDSTATUSClassification = async () => {
const resData = await getLevelsByObject({ const resData = await getLevelsByObject({
@ -36,4 +40,6 @@ export const layoutFnGetSIGNEDSTATUSClassification = async () => {
BIANMA: "TRAFFIC_EMPLOYMENT", BIANMA: "TRAFFIC_EMPLOYMENT",
}); });
return ref(resData); return ref(resData);
}; };

3
src/request/traffic_occupational_hazards.js
View File

@ -14,3 +14,6 @@ export const infoOccupationalHazardsView = (params) =>
export const deleteOccupationalHazardsView = (params) => export const deleteOccupationalHazardsView = (params) =>
post("/occupationalhazards/delete", params); // 删除 岗位安全责任书 post("/occupationalhazards/delete", params); // 删除 岗位安全责任书
export const getSafetyOccupationalHazardsEdit = (params) =>
upload("/occupationalhazards/getSafetyOccupationalHazardsEdit", params); // 详情 职业危害告知书

4
src/request/traffic_safety_production.js
View File

@ -11,3 +11,7 @@ export const infoProductionView = (params) =>
export const deleteProductionView = (params) => export const deleteProductionView = (params) =>
upload("/production/delete", params); // 删除 安全生产目标 upload("/production/delete", params); // 删除 安全生产目标
export const getSafetyProductionEdit = (params) =>
upload("/production/getSafetyProductionEdit", params); // 详情 安全生产目标

4
src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
View File

@ -550,7 +550,7 @@ const fnSubmit = debounce(
await fnUploadImage( await fnUploadImage(
currentOperatingVehicleId, currentOperatingVehicleId,
form.value.DRIVINGLICENSE_PHOTO[i].raw, form.value.DRIVINGLICENSE_PHOTO[i].raw,
131 121
); );
} }
} }
@ -559,7 +559,7 @@ const fnSubmit = debounce(
await fnUploadImage( await fnUploadImage(
currentOperatingVehicleId, currentOperatingVehicleId,
form.value.OPERATING_CERTIFICATE_PHOTO[i].raw, form.value.OPERATING_CERTIFICATE_PHOTO[i].raw,
132 122
); );
} }
} }

4
src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
View File

@ -521,7 +521,7 @@ const fnSubmit = debounce(
await fnUploadImage( await fnUploadImage(
currentOperatingVehicleId, currentOperatingVehicleId,
form.value.DRIVINGLICENSE_PHOTO[i].raw, form.value.DRIVINGLICENSE_PHOTO[i].raw,
131 121
); );
} }
} }
@ -530,7 +530,7 @@ const fnSubmit = debounce(
await fnUploadImage( await fnUploadImage(
currentOperatingVehicleId, currentOperatingVehicleId,
form.value.OPERATING_CERTIFICATE_PHOTO[i].raw, form.value.OPERATING_CERTIFICATE_PHOTO[i].raw,
132 122
); );
} }
} }

8
src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
View File

@ -160,12 +160,8 @@ const fnGetData = async () => {
const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID }); const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID });
info.value = resData.pd; info.value = resData.pd;
info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto); info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto);
info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile( info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile(resData.drivinglicensephoto);
resData.drivinglicensephoto info.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile(resData.operatingcertificatephoto);
);
info.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile(
resData.operatingcertificatephoto
);
}; };
fnGetData(); fnGetData();
</script> </script>

4
src/views/occupational_hazards/details.vue
View File

@ -111,7 +111,7 @@ import Add from "@/views/occupational_hazards/components/add.vue";
import LayoutPdf from "@/components/pdf/index.vue"; import LayoutPdf from "@/components/pdf/index.vue";
import { import {
deleteOccupationalHazardsView, deleteOccupationalHazardsView,
getSafetyOccupationalHazardsList, getSafetyOccupationalHazardsEdit,
getSafetyOccupationalHazardsUserList, getSafetyOccupationalHazardsUserList,
} from "@/request/traffic_occupational_hazards.js"; } from "@/request/traffic_occupational_hazards.js";
@ -155,7 +155,7 @@ const fnAddOrEdit = async (
data.addOrEditDialog.type = type; data.addOrEditDialog.type = type;
data.addOrEditDialog.form = {}; data.addOrEditDialog.form = {};
if (type === "edit" && OCCUPATIONALHAZARDS_ID) { if (type === "edit" && OCCUPATIONALHAZARDS_ID) {
const resData = await getSafetyOccupationalHazardsList({ const resData = await getSafetyOccupationalHazardsEdit({
OCCUPATIONALHAZARDS_ID, OCCUPATIONALHAZARDS_ID,
}); });
if (resData && resData.varList && resData.varList.length > 0) { if (resData && resData.varList && resData.varList.length > 0) {

21
src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue
View File

@ -2,6 +2,9 @@
<layout-card> <layout-card>
<el-divider content-position="left">基本信息</el-divider> <el-divider content-position="left">基本信息</el-divider>
<el-descriptions border> <el-descriptions border>
<el-descriptions-item label="设备编号">
{{ data.FACILITY_NUMBER }}
</el-descriptions-item>
<el-descriptions-item label="设施名称"> <el-descriptions-item label="设施名称">
{{ data.FACILITY_NAME }} {{ data.FACILITY_NAME }}
</el-descriptions-item> </el-descriptions-item>
@ -20,6 +23,18 @@
<el-descriptions-item label="登记时间"> <el-descriptions-item label="登记时间">
{{ data.REGISTRATION_TIME }} {{ data.REGISTRATION_TIME }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="设备设施">
<img
v-for="item in data.Images"
:key="item.FILEPATH"
v-viewer
:src="item.url"
width="100"
height="100"
alt=""
class="ml-10"
/>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-divider content-position="left">保养记录</el-divider> <el-divider content-position="left">保养记录</el-divider>
<layout-table :data="list" :show-pagination="false"> <layout-table :data="list" :show-pagination="false">
@ -84,15 +99,17 @@ import useListData from "@/assets/js/useListData.js";
import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js"; import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import { debounce } from "throttle-debounce"; import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
import { addingPrefixToFile } from "@/assets/js/utils.js";
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const { FIREFIGHTINGFACILITY_ID } = route.query; const { FIREFIGHTINGFACILITY_ID } = route.query;
const data = ref({}); const data = ref({});
const getData = async () => { const getData = async () => {
const { pd } = await getFirefightingEquipmentFacilityView({ const resData = await getFirefightingEquipmentFacilityView({
FIREFIGHTINGFACILITY_ID, FIREFIGHTINGFACILITY_ID,
}); });
data.value = pd; data.value = resData.pd;
data.value.Images = addingPrefixToFile(resData.firefightingequipmentImg);
}; };
getData(); getData();
const { list, fnResetPagination } = useListData(getMaintainFindFirefightingId, { const { list, fnResetPagination } = useListData(getMaintainFindFirefightingId, {

1
src/views/production_course_regulate/management_agreement/components/add.vue
View File

@ -6,7 +6,6 @@
> >
<el-form ref="formRef" :rules="rules" :model="form" label-width="150px"> <el-form ref="formRef" :rules="rules" :model="form" label-width="150px">
<el-form-item <el-form-item
v-if="type === 'add'"
label="名称" label="名称"
prop="MANAGEMENTAGREEMENTNAME" prop="MANAGEMENTAGREEMENTNAME"
> >

4
src/views/production_course_regulate/management_agreement/index.vue
View File

@ -65,8 +65,8 @@
</el-table-column> </el-table-column>
<el-table-column label="有效状态" prop="VALIDSTATUS"> <el-table-column label="有效状态" prop="VALIDSTATUS">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag> <el-tag v-if="row.VALIDSTATUS === '1'" type = "success">正常</el-tag>
<el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag> <el-tag v-else-if="row.VALIDSTATUS === '0'" type = "error">未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />--> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->

15
src/views/production_course_regulate/violation_registration/add.vue
View File

@ -107,7 +107,7 @@
</template> </template>
<script setup> <script setup>
import { getUserListAll } from "@/request/safety_production_related.js"; import { getTrafficPenaltyUserList } from "@/request/safety_production_related.js";
import { onMounted, reactive, ref, toRaw } from "vue"; import { onMounted, reactive, ref, toRaw } from "vue";
import { PENALTYMETHODMENU, TRUCKMENU } from "@/assets/js/constant.js"; import { PENALTYMETHODMENU, TRUCKMENU } from "@/assets/js/constant.js";
import LayoutUpload from "@/components/upload/index.vue"; import LayoutUpload from "@/components/upload/index.vue";
@ -152,14 +152,9 @@ onMounted(async () => {
REGISTRATION_ID: registrationId.value, REGISTRATION_ID: registrationId.value,
}); */ }); */
}); });
const userList = await getTrafficPenaltyUserList();
const router = useRouter(); const router = useRouter();
const fnGetUnitsList = async () => {
const resData = await getUserListAll({});
data.unitsList = resData.userList;
};
fnGetUnitsList();
const data = reactive({ const data = reactive({
form: { form: {
TRANSPORTVEHICLE: "", TRANSPORTVEHICLE: "",
@ -172,6 +167,12 @@ const data = reactive({
fileList: [], fileList: [],
}, },
}); });
const fnGetUnitsList = async () => {
const resData = userList
data.unitsList = resData.userList.varList;
};
fnGetUnitsList();
const fnSubmit = async () => { const fnSubmit = async () => {
await useFormValidate(formRef); await useFormValidate(formRef);

2
src/views/safety_culture/safety_activities/components/add.vue
View File

@ -5,7 +5,7 @@
:before-close="fnClose" :before-close="fnClose"
> >
<el-form ref="formRef" :rules="rules" :model="form" label-width="150px"> <el-form ref="formRef" :rules="rules" :model="form" label-width="150px">
<el-form-item v-if="type === 'add'" label="名称" prop="ACTIVITIESNAME"> <el-form-item label="名称" prop="ACTIVITIESNAME">
<el-input <el-input
v-model="form.ACTIVITIESNAME" v-model="form.ACTIVITIESNAME"
placeholder="请输入名称" placeholder="请输入名称"

2
src/views/safety_culture/safety_manual/components/add.vue
View File

@ -5,7 +5,7 @@
:before-close="fnClose" :before-close="fnClose"
> >
<el-form ref="formRef" :rules="rules" :model="form" label-width="150px"> <el-form ref="formRef" :rules="rules" :model="form" label-width="150px">
<el-form-item v-if="type === 'add'" label="名称" prop="MANUALNAME"> <el-form-item label="名称" prop="MANUALNAME">
<el-input <el-input
v-model="form.MANUALNAME" v-model="form.MANUALNAME"
placeholder="请输入名称" placeholder="请输入名称"

9
src/views/safety_production/index.vue
View File

@ -23,8 +23,8 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="有效状态" prop="VALIDSTATUS"> <el-form-item label="有效状态" prop="VALIDSTATUS">
<el-select v-model="searchForm.VALIDSTATUS" clearable> <el-select v-model="searchForm.VALIDSTATUS" clearable>
<el-option label="正常" :value="1" /> <el-option label="正常" value="1" />
<el-option label="未生效" :value="0" /> <el-option label="未生效" value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -62,7 +62,7 @@
<el-table-column label="有效状态" prop="VALIDSTATUS"> <el-table-column label="有效状态" prop="VALIDSTATUS">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag> <el-tag v-if="row.VALIDSTATUS === '1'">正常</el-tag>
<el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag> <el-tag v-else-if="row.VALIDSTATUS === '2'">未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />--> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
@ -129,6 +129,7 @@ import {
deleteProductionView, deleteProductionView,
getSafetyProductionList, getSafetyProductionList,
infoProductionView, infoProductionView,
getSafetyProductionEdit,
} from "@/request/traffic_safety_production.js"; } from "@/request/traffic_safety_production.js";
import ViewInfo from "./components/view.vue"; import ViewInfo from "./components/view.vue";
import { ElMessage, ElMessageBox } from "element-plus"; import { ElMessage, ElMessageBox } from "element-plus";
@ -150,7 +151,7 @@ const fnAddOrEdit = async (SAFETYPRODUCTION_ID = "", type = "add") => {
data.addOrEditDialog.visible = true; data.addOrEditDialog.visible = true;
data.addOrEditDialog.type = type; data.addOrEditDialog.type = type;
if (type === "edit" && SAFETYPRODUCTION_ID) { if (type === "edit" && SAFETYPRODUCTION_ID) {
const resData = await getSafetyProductionList({ SAFETYPRODUCTION_ID }); const resData = await getSafetyProductionEdit({ SAFETYPRODUCTION_ID });
if (resData && resData.varList && resData.varList.length > 0) { if (resData && resData.varList && resData.varList.length > 0) {
const detail = resData.varList[0]; const detail = resData.varList[0];
data.addOrEditDialog.form = { data.addOrEditDialog.form = {

4
src/views/training_resource_management/course_management/view.vue
View File

@ -13,11 +13,13 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="课程封面"> <el-descriptions-item label="课程封面">
<img <img
v-if="data.info.COVERPATH"
v-viewer v-viewer
:src="VITE_FILE_URL + data.info.COVERPATH" :src="VITE_FILE_URL + data.info.COVERPATH"
alt=""
width="100" width="100"
height="100" height="100"
alt=""
class="ml-10"
/> />
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>