Merge remote-tracking branch 'origin/master'

master
夜笙歌 2 months ago
commit b3654b66c4

@ -0,0 +1,77 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { DmsRecordInspectVO, DmsRecordInspectForm, DmsRecordInspectQuery } from '@/api/dms/dmsRecordInspect/types';
/**
*
* @param query
* @returns {*}
*/
export const listDmsRecordInspect = (query?: DmsRecordInspectQuery): AxiosPromise<DmsRecordInspectVO[]> => {
return request({
url: '/dms/dmsRecordInspect/list',
method: 'get',
params: query
});
};
/**
*
* @param recordInspectId
*/
export const getDmsRecordInspect = (recordInspectId: string | number): AxiosPromise<DmsRecordInspectVO> => {
return request({
url: '/dms/dmsRecordInspect/' + recordInspectId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addDmsRecordInspect = (data: DmsRecordInspectForm) => {
return request({
url: '/dms/dmsRecordInspect',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updateDmsRecordInspect = (data: DmsRecordInspectForm) => {
return request({
url: '/dms/dmsRecordInspect',
method: 'put',
data: data
});
};
/**
*
* @param recordInspectId
*/
export const delDmsRecordInspect = (recordInspectId: string | number | Array<string | number>) => {
return request({
url: '/dms/dmsRecordInspect/' + recordInspectId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getDmsRecordInspectList (query) {
return request({
url: '/dms/dmsRecordInspect/getDmsRecordInspectList',
method: 'get',
params: query
});
};

@ -0,0 +1,251 @@
export interface DmsRecordInspectVO {
/**
*
*/
recordInspectId: string | number;
/**
* IDdms_plan_inspectplan_inspect_id
*/
planInspectId: string | number;
/**
* ID
*/
inspectInstanceId: string | number;
/**
*
*/
billsInspectCode: string;
/**
* (1 2)
*/
inspectType: string;
/**
* 线dms_base_inspect_routeinspect_route_id
*/
inspectRouteId: string | number;
/**
*
*/
deviceAmount: number;
/**
*
*/
planBeginTime: string;
/**
*
*/
planEndTime: string;
/**
*
*/
realBeginTime: string;
/**
*
*/
realEndTime: string;
/**
*
*/
performer: string;
/**
* 1 2 3
*/
inspectStatus: string;
/**
*
*/
inspectDuration: number;
/**
* 1 0
*/
activeFlag: string;
/**
*
*/
remark: string;
}
export interface DmsRecordInspectForm extends BaseEntity {
/**
*
*/
recordInspectId?: string | number;
/**
* IDdms_plan_inspectplan_inspect_id
*/
planInspectId?: string | number;
/**
* ID
*/
inspectInstanceId?: string | number;
/**
*
*/
billsInspectCode?: string;
/**
* (1 2)
*/
inspectType?: string;
/**
* 线dms_base_inspect_routeinspect_route_id
*/
inspectRouteId?: string | number;
/**
*
*/
deviceAmount?: number;
/**
*
*/
planBeginTime?: string;
/**
*
*/
planEndTime?: string;
/**
*
*/
realBeginTime?: string;
/**
*
*/
realEndTime?: string;
/**
*
*/
performer?: string;
/**
* 1 2 3
*/
inspectStatus?: string;
/**
*
*/
inspectDuration?: number;
/**
* 1 0
*/
activeFlag?: string;
/**
*
*/
remark?: string;
}
export interface DmsRecordInspectQuery extends PageQuery {
/**
*
*/
recordInspectId?: string | number;
/**
* IDdms_plan_inspectplan_inspect_id
*/
planInspectId?: string | number;
/**
* ID
*/
inspectInstanceId?: string | number;
/**
*
*/
billsInspectCode?: string;
/**
* (1 2)
*/
inspectType?: string;
/**
* 线dms_base_inspect_routeinspect_route_id
*/
inspectRouteId?: string | number;
/**
*
*/
deviceAmount?: number;
/**
*
*/
planBeginTime?: string;
/**
*
*/
planEndTime?: string;
/**
*
*/
realBeginTime?: string;
/**
*
*/
realEndTime?: string;
/**
*
*/
performer?: string;
/**
* 1 2 3
*/
inspectStatus?: string;
/**
*
*/
inspectDuration?: number;
/**
* 1 0
*/
activeFlag?: string;
/**
*
*/
params?: any;
}

@ -0,0 +1,446 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<!-- <el-form-item label="主键标识" prop="recordInspectId">-->
<!-- <el-input v-model="queryParams.recordInspectId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计划" prop="planInspectId">-->
<!-- <el-input v-model="queryParams.planInspectId" placeholder="请输入计划" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="巡检工单ID" prop="inspectInstanceId">-->
<!-- <el-input v-model="queryParams.inspectInstanceId" placeholder="请输入巡检工单ID" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="巡检单号" prop="billsInspectCode">
<el-input v-model="queryParams.billsInspectCode" placeholder="请输入巡检单号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检查类型" prop="inspectType">
<el-select v-model="queryParams.inspectType" placeholder="请选择检查类型" clearable >
<el-option v-for="dict in inspect_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="巡检线路" prop="inspectRouteId">-->
<!-- <el-input v-model="queryParams.inspectRouteId" placeholder="请输入巡检线路" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="设备总数" prop="deviceAmount">-->
<!-- <el-input v-model="queryParams.deviceAmount" placeholder="请输入设备总数" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计划开始时间" prop="planBeginTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.planBeginTime"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- placeholder="请选择计划开始时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计划完成时间" prop="planEndTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.planEndTime"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- placeholder="请选择计划完成时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实际开始时间" prop="realBeginTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.realBeginTime"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- placeholder="请选择实际开始时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实际结束时间" prop="realEndTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.realEndTime"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- placeholder="请选择实际结束时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="执行人员" prop="performer">-->
<!-- <el-input v-model="queryParams.performer" placeholder="请输入执行人员" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="巡检状态" prop="inspectStatus">
<el-select v-model="queryParams.inspectStatus" placeholder="请选择巡检状态" clearable >
<el-option v-for="dict in dms_inspect_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="巡检用时" prop="inspectDuration">-->
<!-- <el-input v-model="queryParams.inspectDuration" placeholder="请输入巡检用时" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="激活标识" prop="activeFlag">
<el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsRecordInspect:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsRecordInspect:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsRecordInspect:remove']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsRecordInspect:export']"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="dmsRecordInspectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="recordInspectId" v-if="columns[0].visible"/>
<el-table-column label="计划" align="center" prop="planInspectId" v-if="columns[2].visible"/>
<el-table-column label="巡检工单ID" align="center" prop="inspectInstanceId" v-if="columns[3].visible"/>
<el-table-column label="巡检单号" align="center" prop="billsInspectCode" v-if="columns[4].visible"/>
<el-table-column label="检查类型" align="center" prop="inspectType" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="inspect_type" :value="scope.row.inspectType"/>
</template>
</el-table-column>
<el-table-column label="巡检线路" align="center" prop="inspectRouteId" v-if="columns[6].visible"/>
<el-table-column label="设备总数" align="center" prop="deviceAmount" v-if="columns[7].visible"/>
<el-table-column label="计划开始时间" align="center" prop="planBeginTime" width="180" v-if="columns[8].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.planBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="计划完成时间" align="center" prop="planEndTime" width="180" v-if="columns[9].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" prop="realBeginTime" width="180" v-if="columns[10].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.realBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际结束时间" align="center" prop="realEndTime" width="180" v-if="columns[11].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="执行人员" align="center" prop="performer" v-if="columns[12].visible"/>
<el-table-column label="巡检状态" align="center" prop="inspectStatus" v-if="columns[13].visible">
<template #default="scope">
<dict-tag :options="dms_inspect_status" :value="scope.row.inspectStatus"/>
</template>
</el-table-column>
<el-table-column label="巡检用时" align="center" prop="inspectDuration" v-if="columns[14].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[15].visible"/>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[16].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsRecordInspect:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsRecordInspect:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改点巡检历史记录对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="dmsRecordInspectFormRef" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="主键标识" prop="recordInspectId">-->
<!-- <el-input v-model="form.recordInspectId" placeholder="请输入主键标识" />-->
<!-- </el-form-item>-->
<el-form-item label="计划" prop="planInspectId">
<!-- <el-input v-model="form.planInspectId" placeholder="请输入计划" />-->
</el-form-item>
<el-form-item label="巡检工单ID" prop="inspectInstanceId">
<!-- <el-input v-model="form.inspectInstanceId" placeholder="请输入巡检工单ID" />-->
</el-form-item>
<el-form-item label="巡检单号" prop="billsInspectCode">
<el-input v-model="form.billsInspectCode" placeholder="请输入巡检单号" />
</el-form-item>
<el-form-item label="检查类型" prop="inspectType">
<el-select v-model="form.inspectType" placeholder="请选择检查类型">
<el-option
v-for="dict in inspect_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="巡检线路" prop="inspectRouteId">
<el-input v-model="form.inspectRouteId" placeholder="请输入巡检线路" />
</el-form-item>
<el-form-item label="设备总数" prop="deviceAmount">
<el-input v-model="form.deviceAmount" placeholder="请输入设备总数" />
</el-form-item>
<el-form-item label="计划开始时间" prop="planBeginTime">
<el-date-picker clearable
v-model="form.planBeginTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择计划开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="计划完成时间" prop="planEndTime">
<el-date-picker clearable
v-model="form.planEndTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择计划完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="实际开始时间" prop="realBeginTime">
<el-date-picker clearable
v-model="form.realBeginTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择实际开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="实际结束时间" prop="realEndTime">
<el-date-picker clearable
v-model="form.realEndTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择实际结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="执行人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入执行人员" />
</el-form-item>
<el-form-item label="巡检状态" prop="inspectStatus">
<el-select v-model="form.inspectStatus" placeholder="请选择巡检状态">
<el-option
v-for="dict in dms_inspect_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="巡检用时" prop="inspectDuration">
<el-input v-model="form.inspectDuration" placeholder="请输入巡检用时" />
</el-form-item>
<el-form-item label="激活标识" prop="activeFlag">
<el-input v-model="form.activeFlag" placeholder="请输入激活标识" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="DmsRecordInspect" lang="ts">
import { listDmsRecordInspect, getDmsRecordInspect, delDmsRecordInspect, addDmsRecordInspect, updateDmsRecordInspect } from '@/api/dms/dmsRecordInspect';
import { DmsRecordInspectVO, DmsRecordInspectQuery, DmsRecordInspectForm } from '@/api/dms/dmsRecordInspect/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { inspect_type, dms_inspect_status } = toRefs<any>(proxy?.useDict('inspect_type', 'dms_inspect_status'));
const dmsRecordInspectList = ref<DmsRecordInspectVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const dmsRecordInspectFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `计划`, visible: true },
{ key: 3, label: `巡检工单ID`, visible: false },
{ key: 4, label: `巡检单号`, visible: true },
{ key: 5, label: `检查类型`, visible: true },
{ key: 6, label: `巡检线路`, visible: true },
{ key: 7, label: `设备总数`, visible: true },
{ key: 8, label: `计划开始时间`, visible: true },
{ key: 9, label: `计划完成时间`, visible: true },
{ key: 10, label: `实际开始时间`, visible: true },
{ key: 11, label: `实际结束时间`, visible: true },
{ key: 12, label: `执行人员`, visible: true },
{ key: 13, label: `巡检状态`, visible: true },
{ key: 14, label: `巡检用时`, visible: true },
{ key: 15, label: `激活标识`, visible: true },
{ key: 16, label: `备注`, visible: true },
{ key: 17, label: `创建部门`, visible: false },
{ key: 18, label: `创建人`, visible: false },
{ key: 19, label: `创建时间`, visible: false },
{ key: 20, label: `更新人`, visible: false },
{ key: 21, label: `更新时间`, visible: false },
]);
const initFormData: DmsRecordInspectForm = {
recordInspectId: undefined,
planInspectId: undefined,
inspectInstanceId: undefined,
billsInspectCode: undefined,
inspectType: undefined,
inspectRouteId: undefined,
deviceAmount: undefined,
planBeginTime: undefined,
planEndTime: undefined,
realBeginTime: undefined,
realEndTime: undefined,
performer: undefined,
inspectStatus: undefined,
inspectDuration: undefined,
activeFlag: undefined,
remark: undefined,
}
const data = reactive<PageData<DmsRecordInspectForm, DmsRecordInspectQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
recordInspectId: undefined,
planInspectId: undefined,
inspectInstanceId: undefined,
billsInspectCode: undefined,
inspectType: undefined,
inspectRouteId: undefined,
deviceAmount: undefined,
planBeginTime: undefined,
planEndTime: undefined,
realBeginTime: undefined,
realEndTime: undefined,
performer: undefined,
inspectStatus: undefined,
inspectDuration: undefined,
activeFlag: undefined,
params: {
}
},
rules: {
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询点巡检历史记录列表 */
const getList = async () => {
loading.value = true;
const res = await listDmsRecordInspect(queryParams.value);
dmsRecordInspectList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
dmsRecordInspectFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: DmsRecordInspectVO[]) => {
ids.value = selection.map(item => item.recordInspectId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加点巡检历史记录";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: DmsRecordInspectVO) => {
reset();
const _recordInspectId = row?.recordInspectId || ids.value[0]
const res = await getDmsRecordInspect(_recordInspectId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改点巡检历史记录";
}
/** 提交按钮 */
const submitForm = () => {
dmsRecordInspectFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.recordInspectId) {
await updateDmsRecordInspect(form.value).finally(() => buttonLoading.value = false);
} else {
await addDmsRecordInspect(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: DmsRecordInspectVO) => {
const _recordInspectIds = row?.recordInspectId || ids.value;
await proxy?.$modal.confirm('是否确认删除点巡检历史记录编号为"' + _recordInspectIds + '"的数据项?').finally(() => loading.value = false);
await delDmsRecordInspect(_recordInspectIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('dms/dmsRecordInspect/export', {
...queryParams.value
}, `dmsRecordInspect_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>
Loading…
Cancel
Save