Commit 14c2ded6 by 陈岩

feat: 聚类增加人员分类分组

1 parent 6eb37c90
...@@ -201,6 +201,15 @@ class ClusterResultApi { ...@@ -201,6 +201,15 @@ class ClusterResultApi {
} }
) )
} }
updateRecognitionApi(data) {
return axiosInstance.request(
{
method: 'get',
url: `/faceRecognitions/movePerson`,
params: data
}
)
}
// 删除图片 // 删除图片
deleteRecognition(data) { deleteRecognition(data) {
return axiosInstance.request( return axiosInstance.request(
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</a-form-item> </a-form-item>
<a-form-item style="padding: 5px 0"> <a-form-item style="padding: 5px 0">
<a-button type="primary" @click="clickSearch" :loading="isLoading">查询</a-button> <a-button type="primary" @click="clickSearch" :loading="isLoading">查询</a-button>
<a-button @click="handleAddGroup()" :loading="addGroupLoading" style="margin-left: 10px">加入选中图片</a-button> <a-button @click="()=>handleAddGroup(null, '')" :loading="addGroupLoading" style="margin-left: 10px">加入选中图片</a-button>
<a-alert style="display: inline-block;margin-left: 20px" message="提示:单击选择图片,再次单击,取消选择。双击预览图片。Ctrl+单击图片可搜索该图片后最近20条抓拍记录。" type="info" /> <a-alert style="display: inline-block;margin-left: 20px" message="提示:单击选择图片,再次单击,取消选择。双击预览图片。Ctrl+单击图片可搜索该图片后最近20条抓拍记录。" type="info" />
</a-form-item> </a-form-item>
</a-form> </a-form>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<div style="display: flex;align-items: center;justify-content: space-between;position: relative;top:-5px;"> <div style="display: flex;align-items: center;justify-content: space-between;position: relative;top:-5px;">
<span>{{row.person_unid}}</span> <span>{{row.person_unid}}</span>
<div> <div>
<a-button @click="handleAddGroup(row.personList)" :loading="addGroupLoading">加入此分组内图片</a-button> <a-button @click="handleAddGroup(row.personList,row.person_unid)" :loading="addGroupLoading">加入此分组内图片</a-button>
</div> </div>
</div> </div>
<el-row> <el-row>
...@@ -230,7 +230,7 @@ export default { ...@@ -230,7 +230,7 @@ export default {
return selectedImgList.value.some(item => item.id === data.id) return selectedImgList.value.some(item => item.id === data.id)
} }
const addGroupLoading = ref(false) const addGroupLoading = ref(false)
const handleAddGroup = (dataList) => { const handleAddGroup = (dataList,srcPersonUnid) => {
const targetDataList = dataList || selectedImgList.value const targetDataList = dataList || selectedImgList.value
if (targetDataList.length > 0) { if (targetDataList.length > 0) {
const strUnidList = targetDataList.map((item) => item.unid).join(',') const strUnidList = targetDataList.map((item) => item.unid).join(',')
...@@ -240,28 +240,60 @@ export default { ...@@ -240,28 +240,60 @@ export default {
countdate:formData.value.date, countdate:formData.value.date,
} }
addGroupLoading.value = true addGroupLoading.value = true
clusterResultApi.updateRecognition(params).then((r) => { // 原有数据不变
if(r.msg_code === 200) { if(!dataList){
ElMessage({ clusterResultApi.updateRecognition(params).then((r) => {
message: `添加成功`, if(r.msg_code === 200) {
type: 'success' ElMessage({
}) message: `添加成功`,
for(let i=0;i<targetDataList.length;i++) { type: 'success'
targetDataList[i].person_unid = personList.value[0].person_unid })
} for(let i=0;i<targetDataList.length;i++) {
personList.value = personList.value.concat(targetDataList) targetDataList[i].person_unid = personList.value[0].person_unid
selectedImgList.value = [] }
personList.value = personList.value.concat(targetDataList)
selectedImgList.value = []
clickSearch() clickSearch()
} else { } else {
ElMessage({ ElMessage({
message: `添加失败`, message: `添加失败`,
type: 'error' type: 'error'
}) })
}
}).finally(() => {
addGroupLoading.value = false
})
}else{
const param = {
dstPersonUnid:personUnid.value,
srcPersonUnid,
countdate:formData.value.date,
} }
}).finally(() => { clusterResultApi.updateRecognitionApi(param).then((r) => {
addGroupLoading.value = false if(r.msg_code === 200) {
}) ElMessage({
message: `添加成功`,
type: 'success'
})
for(let i=0;i<targetDataList.length;i++) {
targetDataList[i].person_unid = personList.value[0].person_unid
}
personList.value = personList.value.concat(targetDataList)
selectedImgList.value = []
clickSearch()
} else {
ElMessage({
message: `添加失败`,
type: 'error'
})
}
}).finally(() => {
addGroupLoading.value = false
})
}
} else { } else {
ElMessage({ ElMessage({
message: `请选择分组图片`, message: `请选择分组图片`,
......
...@@ -9,13 +9,15 @@ ...@@ -9,13 +9,15 @@
> >
<a-form :model="formData"> <a-form :model="formData">
<a-form-item label="分组"> <a-form-item label="分组">
<a-select v-model:value="formData.personUnid" showSearch placeholder="请选择分组id"> <a-input v-model:value="formData.personUnid" />
<!-- <a-select v-model:value="formData.personUnid" showSearch placeholder="请选择分组id">
<a-select-option <a-select-option
v-for="item in showDataList" v-for="item in showDataList"
:key="item" :key="item"
:value="item" :value="item"
>人id:{{item}}</a-select-option> >人id:{{item}}</a-select-option>
</a-select> </a-select> -->
</a-form-item> </a-form-item>
</a-form> </a-form>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!