Compare commits

...

2 Commits

Author SHA1 Message Date
xiepeng 3e709eb383 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 13:38:52 +08:00
xiepeng d77a118fc8 BUG 优化 2024-03-29 13:38:39 +08:00
7 changed files with 68 additions and 35 deletions

View File

@ -87,10 +87,11 @@
<layout-table
ref="tableRef"
v-model:pagination="pagination"
row-key="OPERATING_ID"
row-key="HIDDEN_ID"
:data="list"
@get-data="fnGetDataTransfer"
>
<el-table-column reserve-selection type="selection" width="55" />
<el-table-column label="序号" width="70">
<template #default="{ $index }">
{{ serialNumber(pagination, $index) }}
@ -214,11 +215,17 @@ const fnDelete = debounce(
const fnExport = async () => {
const selectionData = tableRef.value.getSelectionRows();
if (selectionData.length === 0) {
ElMessage.warning("请选择需要导出至excel报表的记录信息");
return;
}
await ElMessageBox.confirm("确定要导出到excel吗", { type: "warning" });
const DATA_IDS = selectionData.map((item) => item.OPERATING_ID).join(",");
const DATA_IDS = selectionData
.map((item) => item.OPERATING_ID)
.join(",");
window.location.href =
import.meta.env[import.meta.env.DEV ? "VITE_PROXY" : "VITE_BASE_URL"] +
"/operationunit/excel?" +
"/operatingvehicles/excel?" +
"&KEYWORDS=" +
(searchForm.value.KEYWORDS || "") +
"&DATA_IDS=" +

View File

@ -38,7 +38,6 @@
<el-button native-type="reset" @click="fnResetPagination">
重置
</el-button>
<el-button native-type="reset" @click="fnWindow"> BI </el-button>
</el-form-item>
</el-col>
</el-row>
@ -232,11 +231,6 @@ const reviewItem = async (row) => {
data.reviewDialog.form = row;
};
const fnWindow = async () => {
window.open(
"http://60.10.47.50:9001/#/middlePage?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXNzd2QiOiJMZmtmcUAxMjM0NTYiLCJleHAiOjE3MTEwMzMxMDksInVzZXIiOiJsZnlqemh6cCIsInRhcmdldCI6Imh0dHA6Ly8xOTIuMTY4LjAuNjk6ODA4Mi8jL21pZGRsZVBhZ2U_dG9rZW49ZXlKMGVYQWlPaUpLVjFRaUxDSmhiR2NpT2lKSVV6STFOaUo5LmV5SndZWE56ZDJRaU9pSTJOalkyTmpZaUxDSmxlSEFpT2pFM01UQTRPVFE1TURVc0luVnpaWElpT2lMbHU0cmxuWXJudTRfbXRZN21pb0RtbktfbHZJRGxqNUhsakxybHVwVG1nS1hsc1lBaUxDSjBZWEpuWlhRaU9pSm9kSFJ3T2k4dk5qQXVNVEF1TkRjdU5UQTZPVEF3TVM4akwySnBMMmx1WkdWNEluMC5VSlNtT1BwTjA4N1I3cGYyTDdpRDN2YkxjblQ5MFRQQmtTNm0wdHUtTFU0In0.qTqwPwlAmdqAOzyUJSt6kye5svfSBNV5fbcdhn0jey4"
);
};
//
const fnGetLevels = async () => {
const { value: personnelTypeList } = await layoutFnGetPersonnelTypeTraffic({

View File

@ -26,15 +26,18 @@
<el-descriptions-item label-class-name="width_200" label="初登日期">
{{ data.busInfo.INITIAL_REGISTRATION_DATE }}
</el-descriptions-item>
<!--<el-descriptions-item label-class-name="width_200" label="经营企业">-->
<!--{{ info.CAR_OWNERS }}-->
<!--</el-descriptions-item>-->
<el-descriptions-item label-class-name="width_200" label="所属区域">
{{ data.busInfo.COMPANY_AREA }}
</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">北斗信息</el-divider>
<el-descriptions :column="2" border>
<el-descriptions-item label-class-name="width_200" label="登记人">
{{ info.REGISTRANT }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="车主业户">
{{ info.CAR_OWNERS }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="入网公司">
{{ info.NETWORK_ACCESS_COMPANY }}
</el-descriptions-item>
@ -139,6 +142,7 @@ const fnGetData = async () => {
if (!BEIDOU_ID) return;
const resData = await getBeidouView(BEIDOU_ID);
info.value = resData.pd;
console.log("数据",info.value);
info.value.BEIDOUINFO = [];
fnBusChange(resData.pd.VEHICLE);
info.value.BEIDOUINFO = addingPrefixToFile(resData.beidouinfoImgs);

View File

@ -300,13 +300,29 @@ const fnStatusChange = debounce(
{ atBegin: true }
);
const buttonJurisdiction = await useButtonJurisdiction("hidden");
const fnExport = () => {
const fnExport = async () => {
const selectionData = tableRef.value.getSelectionRows();
data.exportExcelDialog.ids = selectionData.map(
(item) => item.INSPECTANNUALLY_ID
);
data.exportExcelDialog.visible = true;
console.log("selectionData",selectionData);
if (selectionData.length === 0) {
ElMessage.warning("请选择需要导出至excel报表的记录信息");
return;
}
await ElMessageBox.confirm("确定要导出到excel吗", { type: "warning" });
const DATA_IDS = selectionData
.map((item) => item.INSPECTANNUALLY_ID)
.join(",");
window.location.href =
import.meta.env[import.meta.env.DEV ? "VITE_PROXY" : "VITE_BASE_URL"] +
"/operatingvehicles/excel?" +
"&KEYWORDS=" +
(searchForm.value.KEYWORDS || "") +
"&DATA_IDS=" +
DATA_IDS;
};
</script>
<style scoped></style>

View File

@ -30,9 +30,9 @@
<el-descriptions-item label-class-name="width_200" label="初登日期">
{{ data.busInfo.INITIAL_REGISTRATION_DATE }}
</el-descriptions-item>
<!--<el-descriptions-item label-class-name="width_200" label="经营企业">-->
<!--{{ info.CAR_OWNERS }}-->
<!--</el-descriptions-item>-->
<el-descriptions-item label-class-name="width_200" label="所属区域">
{{ info.AREA }}
</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">年检信息</el-divider>
<el-descriptions :column="2" border>

View File

@ -44,6 +44,12 @@
<el-descriptions-item label-class-name="width_200" label="登记人">
{{ info.REGISTRANT }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="车主业户">
{{ info.CAR_OWNERS }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="联系电话">
{{ info.TELEPHONE }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="保险公司">
<span v-if="info.INSURANCE_COMPANY === '1'"></span>
<span v-else-if="info.INSURANCE_COMPANY === '2'">中国人寿</span>

View File

@ -17,44 +17,50 @@
<el-descriptions-item label-class-name="width_200" label="车辆类型">
{{ data.busInfo.TRAILER_TYPE }}
</el-descriptions-item>
<!-- <el-descriptions-item label-class-name="width_200" label="车辆型号">-->
<!-- {{ data.busInfo.VEHICLE_MODEL }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item label-class-name="width_200" label="车辆品牌">-->
<!-- {{ data.busInfo.VEHICLE_BRAND }}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item label-class-name="width_200" label="车主电话">
{{ data.busInfo.CAR_OWNERS_TEL }}
</el-descriptions-item>
<!-- <el-descriptions-item label-class-name="width_200" label="车辆品牌">
{{ data.busInfo.VEHICLE_BRAND }}
</el-descriptions-item>-->
<el-descriptions-item label-class-name="width_200" label="车主业户">
{{ data.busInfo.CAR_OWNERS }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="联系电话">
{{ data.busInfo.CAR_OWNERS_TEL }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="初登日期">
{{ data.busInfo.INITIAL_REGISTRATION_DATE }}
</el-descriptions-item>
<!--<el-descriptions-item label-class-name="width_200" label="经营企业">-->
<!--{{ info.CAR_OWNERS }}-->
<!--</el-descriptions-item>-->
<el-descriptions-item label-class-name="width_200" label="所属区域">
{{ data.busInfo.COMPANY_AREA }}
</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">维保信息</el-divider>
<el-descriptions :column="2" border>
<el-descriptions-item label-class-name="width_200" label="协议编号">
{{ info.AGREEMENT_NUM }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="登记人">
{{ info.REGISTRANT }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="车主业主">
{{ info.CAR_OWNERS }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="联系电话">
{{ info.TELEPHONE }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="维保等级">
{{
translationStatus(info.MAINTENANCE_LEVEL, MAINTENANCE_LEVEL_LIST)
}}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="协议编号">
{{ info.AGREEMENT_NUM }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="维保公里数">
{{ info.KILOMETERS }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="维保周期">
{{ info.MAINTENANCE_CYCLE + "天" }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="维保单位">
{{ info.MAINTENANCE_COMPANY }}
</el-descriptions-item>
<el-descriptions-item label-class-name="width_200" label="办理日期">
{{ info.PROCESSING_DATE }}
</el-descriptions-item>