Commit 0c999ad4 by 李乾广

修改bug,数据聚类--单张特征对比功能优化

1 parent 57a5e9d7
......@@ -17,7 +17,8 @@ class FeatureResultApi {
return axiosInstance.request(
{
method: 'GET',
url: `/feature/allPersonContrast`,
// url: `/feature/allPersonContrast`,
url: `/feature/allPersonContrastGroup`,
params: filterEmptyValueInObject(
data
)
......
......@@ -630,6 +630,8 @@ export default {
let parmas = {
person_unid:currobj.value.person_unid,
pic_type:rawData.picType,
endTime:rawData.endTime,
startTime:rawData.startTime,
countdate:formatDate(rawData.date),
pic_id:currobj.value.id,
ip:window._baseImgUrl,
......
......@@ -105,6 +105,9 @@
<a-form-item style="padding: 5px 0">
<a-button type="primary" @click="comparativeFun">特征对比验证</a-button>
</a-form-item>
<a-form-item style="padding: 5px 0">
<a-button type="primary" @click="singleComparativeFun">单张特征对比</a-button>
</a-form-item>
</a-form>
<div v-loading="isLoading">
......@@ -150,6 +153,7 @@
</div>
<!-- <imgDialog ref='imgModelRef'></imgDialog> -->
<DetailDialog ref="DetailDialogRef" />
<singleImgComparisonDialog ref="singleImgComparisonRef"></singleImgComparisonDialog>
</template>
<script>
......@@ -161,10 +165,12 @@ import {filterEmptyValueInObject, formatDate, formatTime, getPagedList} from '@/
// import imgDialog from '../imgDialog.vue'
import {ElMessage} from 'element-plus'
import DetailDialog from "../../ComparisonCapturedPictures/DetailDialog.vue";
import singleImgComparisonDialog from "../singleImgComparisonDialog.vue";
export default {
components:{
// imgDialog ,
DetailDialog
DetailDialog,
singleImgComparisonDialog
},
setup() {
// scalar
......@@ -512,6 +518,40 @@ export default {
}
DetailDialogRef.value.initDialog(currobj.value,parmas);
}
//单张特征对比
const singleImgComparisonRef = ref()
const singleComparativeFun = function(){
if(!currobj.value.id){
ElMessage(
{
message: `请选择图片`,
type: 'warning'
}
)
return
}
if(!currobj.value.picture_url){
ElMessage(
{
message: `该图片没有特征,请选择有效的图片`,
type: 'warning'
}
)
return
}
const rawData = toRaw(queryForm)
let parmas = {
person_unid:currobj.value.person_unid,
pic_type:rawData.picType,
endTime:rawData.endTime,
startTime:rawData.startTime,
countdate:formatDate(rawData.date),
pic_id:currobj.value.id,
ip:window._baseImgUrl,
plaza_id:currobj.value.mall_id
}
singleImgComparisonRef.value.initDialog(parmas);
}
const clickSearch = function() {
pageNum.value = 1
confirmSearch()
......@@ -557,7 +597,9 @@ export default {
clickSearch,
// ref
DetailDialogRef,
imgModelRef
imgModelRef,
singleComparativeFun,
singleImgComparisonRef
}
}
}
......
<template>
<a-modal
title="图片"
:title="'图片' + ' ' + unidStr"
v-if='isVisible'
v-model:visible="isVisible"
width="1200px"
......@@ -25,8 +25,11 @@ export default {
const imgUrl = ref()
const canvas = ref()
const ctx = ref()
const initDialog = (url,data) => {
const unidStr = ref('')
const initDialog = (unid,url,data) => {
console.log(unid,url,data,)
imgUrl.value = url
unidStr.value = unid
isVisible.value = true;
setTimeout(()=>{
var imgscream=document.getElementById("img");
......@@ -56,6 +59,7 @@ export default {
initDialog,
isLoading,
imgUrl,
unidStr,
detailData
};
},
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!