Skip to content

A
ai-yunshou-vue
Commit 87cdf123 authored by 胡占生's avatar 胡占生 🇨🇳
Browse files
Options

fix:人脸库管理，接口对接联调，页面模块构建

parent 539ff970
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 283 deletions
src/api/faceControl/index.js 0 → 100644
View file @ 87cdf123
/**
* 新增人脸库管理
* @param {object} params aiFacedbInfo
* @param {string} params.createBy
* @param {string} params.createByName
* @param {object} params.createTime
* @param {string} params.deptId
* @param {string} params.faceImg
* @param {string} params.facedbId
* @param {string} params.id
* @param {string} params.idNumber
* @param {string} params.isDel
* @param {string} params.personName
* @param {string} params.phoneNumber
* @param {string} params.remark
* @param {string} params.updateBy
* @param {string} params.updateByName
* @param {object} params.updateTime
* @returns
*/
import request from '@/utils/request'
// 查询人脸列表
export function listFace(query) {
return request({
url: '/yunshou/facedb/list',
method: 'get',
params: query
})
}
// 新增人脸列表
export function addFace(data) {
return request({
url: '/yunshou/facedb',
method: 'post',
data: data
})
}
// 修改人脸列表
export function updateFace(data) {
return request({
url: '/yunshou/facedb',
method: 'put',
data: data
})
}
// 删除人脸列表
export function deleteFace(ids) {
return request({
url: `/yunshou/facedb/${ids}`,
method: 'delete'
})
}
// 查询人脸详情
export function detailAlg(ids) {
return request({
url: `/yunshou/facedb/${ids}`,
method: 'get',
})
}
// 导出人脸列表
export function exportFace(data) {
return request({
url: `/yunshou/facedb/export`,
method: 'post',
data: data
})
}
src/views/faceControl/index.vue
View file @ 87cdf123
<template>
<div class="app-container">
<TabTitle :text="nowText" />
<el-card class="left-list">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
<el-form-item label="姓名" prop="name">
<el-form-item label="姓名" prop="personName">
<el-input
v-model="queryParams.name"
v-model="queryParams.personName"
placeholder="请输入姓名"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="身份证号" prop="IDCard">
<el-form-item label="身份证号" prop="idNumber">
<el-input
v-model="queryParams.IDCard"
v-model="queryParams.idNumber"
placeholder="请输入身份证号"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="所属部门" prop="deptName">
<el-select v-model="queryParams.deptName" placeholder="请选择所属部门" clearable style="width: 200px">
<el-form-item label="所属部门" prop="deptId">
<el-select v-model="queryParams.deptId" placeholder="请选择所属部门" clearable style="width: 200px">
<el-option
v-for="dict in sys_job_status"
:key="dict.value"
......@@ -45,69 +44,39 @@
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['monitor:job:add']"
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['monitor:job:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:job:remove']"
>删除</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>导入</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="faceList" >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="姓名" width="100" align="center" prop="jobId" />
<el-table-column label="手机号" align="center" prop="jobName" :show-overflow-tooltip="true" />
<el-table-column label="身份证号" align="center" prop="jobGroup">
<template #default="scope">
<dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
</template>
</el-table-column>
<el-table-column label="所属部门" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
<el-table-column label="操作人" align="center">
<el-table-column label="姓名" width="100" align="center" prop="personName" />
<el-table-column label="手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
<el-table-column label="身份证号" align="center" prop="idNumber" />
<el-table-column label="所属部门" align="center" prop="deptId" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
<el-table-column label="操作人" align="center" prop="createByName" />
<el-table-column label="人脸照片" align="center">
<template #default="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
<ImagePreview style="width: 50px;" :src="scope.row.faceImg"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200" 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="['monitor:job:edit']"></el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" ></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['monitor:job:remove']"></el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" ></el-button>
</el-tooltip>
</template>
</el-table-column>
......@@ -124,17 +93,27 @@
<!-- 添加或修改定时任务对话框 -->
<el-dialog :title="title" v-model="open" width="820px" append-to-body>
<el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="faceRef" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="任务名称" prop="jobName">
<el-input v-model="form.jobName" placeholder="请输入任务名称" />
<el-col :span="22">
<el-form-item label="姓名" prop="personName">
<el-input v-model="form.personName" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务分组" prop="jobGroup">
<el-select v-model="form.jobGroup" placeholder="请选择">
<el-col :span="22">
<el-form-item label="手机号" prop="phoneNumber">
<el-input v-model="form.phoneNumber" placeholder="请输入手机号" />
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model="form.idNumber" placeholder="请输入身份证号" />
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item label="所属部门" prop="deptId">
<el-select v-model="form.deptId" placeholder="请选择">
<el-option
v-for="dict in sys_job_group"
:key="dict.value"
......@@ -144,64 +123,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="invokeTarget">
<template #label>
<span>
调用方法
<el-tooltip placement="top">
<template #content>
<div>
Bean调用示例：ryTask.ryParams('ry')
<br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
<br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
</div>
</template>
<el-icon><question-filled /></el-icon>
</el-tooltip>
</span>
</template>
<el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="cron表达式" prop="cronExpression">
<el-input v-model="form.cronExpression" placeholder="请输入cron执行表达式">
<template #append>
<el-button type="primary" @click="handleShowCron">
生成表达式
<i class="el-icon-time el-icon--right"></i>
</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.jobId !== undefined">
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_job_status"
:key="dict.value"
:value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="执行策略" prop="misfirePolicy">
<el-radio-group v-model="form.misfirePolicy">
<el-radio-button value="1">立即执行</el-radio-button>
<el-radio-button value="2">执行一次</el-radio-button>
<el-radio-button value="3">放弃执行</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否并发" prop="concurrent">
<el-radio-group v-model="form.concurrent">
<el-radio-button value="0">允许</el-radio-button>
<el-radio-button value="1">禁止</el-radio-button>
</el-radio-group>
<el-col :span="22">
<el-form-item label="人脸照片" prop="faceImg">
<ImageUpload :modelValue="form.faceImg" :limit='1' :fileSize="10" @update:modelValue="getImageUrl"/>
</el-form-item>
</el-col>
</el-row>
......@@ -213,117 +137,59 @@
</div>
</template>
</el-dialog>
<el-dialog title="Cron表达式生成器" v-model="openCron" append-to-body destroy-on-close>
<crontab ref="crontabRef" @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
</el-dialog>
<!-- 任务日志详细 -->
<el-dialog title="任务详细" v-model="openView" width="700px" append-to-body>
<el-form :model="form" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
<el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务分组：">{{ jobGroupFormat(form) }}</el-form-item>
<el-form-item label="创建时间：">{{ form.createTime }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="cron表达式：">{{ form.cronExpression }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下次执行时间：">{{ parseTime(form.nextValidTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="调用目标方法：">{{ form.invokeTarget }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务状态：">
<div v-if="form.status == 0">正常</div>
<div v-else-if="form.status == 1">暂停</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否并发：">
<div v-if="form.concurrent == 0">允许</div>
<div v-else-if="form.concurrent == 1">禁止</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="执行策略：">
<div v-if="form.misfirePolicy == 0">默认策略</div>
<div v-else-if="form.misfirePolicy == 1">立即执行</div>
<div v-else-if="form.misfirePolicy == 2">执行一次</div>
<div v-else-if="form.misfirePolicy == 3">放弃执行</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="openView = false">关 闭</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Job">
import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } from "@/api/monitor/job";
import Crontab from '@/components/Crontab'
<script setup name="face">
import { listFace, detailAlg, deleteFace, addFace, updateFace} from "@/api/faceControl/index.js";
const router = useRouter();
const { proxy } = getCurrentInstance();
const { sys_job_group, sys_job_status } = proxy.useDict("sys_job_group", "sys_job_status");
const nowText = ref("人脸管理");
const jobList = ref([]);
const faceList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const openView = ref(false);
const openCron = ref(false);
const expression = ref("");
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
jobName: undefined,
jobGroup: undefined,
status: undefined
},
rules: {
jobName: [{ required: true, message: "任务名称不能为空", trigger: "blur" }],
invokeTarget: [{ required: true, message: "调用目标字符串不能为空", trigger: "blur" }],
cronExpression: [{ required: true, message: "cron执行表达式不能为空", trigger: "change" }]
personName: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
phoneNumber: [{ required: true, message: "手机号不能为空", trigger: "blur" },
{pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }
],
idNumber: [{ required: true, message: "身份证号不能为空", trigger: "blur" },
{ pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '请输入正确的身份证号', trigger: 'blur' }
],
faceImg: [{ required: true, message: "人脸照片不能为空", trigger: "blur" }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询定时任务列表 */
function getImageUrl(url){
form.value.faceImg=url
}
/** 查询列表 */
function getList() {
loading.value = true;
listJob(queryParams.value).then(response => {
jobList.value = response.rows;
listFace(queryParams.value).then(response => {
faceList.value = response.rows;
total.value = response.total;
loading.value = false;
});
}
/** 任务组名字典翻译 */
function jobGroupFormat(row, column) {
return proxy.selectDictLabel(sys_job_group.value, row.jobGroup);
}
/** 取消按钮 */
function cancel() {
open.value = false;
......@@ -333,16 +199,13 @@
/** 表单重置 */
function reset() {
form.value = {
jobId: undefined,
jobName: undefined,
jobGroup: undefined,
invokeTarget: undefined,
cronExpression: undefined,
misfirePolicy: 1,
concurrent: 1,
status: "0"
personName: undefined,
phoneNumber: undefined,
idNumber: undefined,
deptId: undefined,
faceImg: undefined,
};
proxy.resetForm("jobRef");
proxy.resetForm("faceRef");
}
/** 搜索按钮操作 */
......@@ -356,77 +219,7 @@
proxy.resetForm("queryRef");
handleQuery();
}
// 多选框选中数据
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.jobId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
// 更多操作触发
function handleCommand(command, row) {
switch (command) {
case "handleRun":
handleRun(row);
break;
case "handleView":
handleView(row);
break;
case "handleJobLog":
handleJobLog(row);
break;
default:
break;
}
}
// 任务状态修改
function handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
proxy.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗?').then(function () {
return changeJobStatus(row.jobId, row.status);
}).then(() => {
proxy.$modal.msgSuccess(text + "成功");
}).catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
}
/* 立即执行一次 */
function handleRun(row) {
proxy.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗?').then(function () {
return runJob(row.jobId, row.jobGroup);
}).then(() => {
proxy.$modal.msgSuccess("执行成功");})
.catch(() => {});
}
/** 任务详细信息 */
function handleView(row) {
getJob(row.jobId).then(response => {
form.value = response.data;
openView.value = true;
});
}
/** cron表达式按钮操作 */
function handleShowCron() {
expression.value = form.value.cronExpression;
openCron.value = true;
}
/** 确定后回传值 */
function crontabFill(value) {
form.value.cronExpression = value;
}
/** 任务日志列表查询 */
function handleJobLog(row) {
const jobId = row.jobId || 0;
router.push('/monitor/job-log/index/' + jobId)
}
/** 新增按钮操作 */
function handleAdd() {
reset();
......@@ -437,8 +230,8 @@
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
const jobId = row.jobId || ids.value;
getJob(jobId).then(response => {
const id = row.id || ids.value;
detailAlg(id).then(response => {
form.value = response.data;
open.value = true;
title.value = "修改任务";
......@@ -447,16 +240,16 @@
/** 提交按钮 */
function submitForm() {
proxy.$refs["jobRef"].validate(valid => {
proxy.$refs["faceRef"].validate(valid => {
if (valid) {
if (form.value.jobId != undefined) {
updateJob(form.value).then(response => {
if (form.value.id != undefined) {
updateFace(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addJob(form.value).then(response => {
addFace(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
......@@ -468,9 +261,9 @@
/** 删除按钮操作 */
function handleDelete(row) {
const jobIds = row.jobId || ids.value;
proxy.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?').then(function () {
return delJob(jobIds);
const ids = row.id || ids.value;
proxy.$modal.confirm('是否确认删除"' + row.personName + '"的数据项?').then(function () {
return deleteFace(ids);
}).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
......@@ -479,9 +272,9 @@
/** 导出按钮操作 */
function handleExport() {
proxy.download("monitor/job/export", {
...queryParams.value,
}, `job_${new Date().getTime()}.xlsx`);
// proxy.download("monitor/job/export", {
// ...queryParams.value,
// }, `job_${new Date().getTime()}.xlsx`);
}
getList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment