Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 1eebc440 by 李君
Options

优化

1 parent af51992e
Inline Side-by-side
Showing 6 changed files with 81 additions and 35 deletions
src/Request/PublicAxiosInstance.js
...@@ -26,7 +26,7 @@ axiosInstance.interceptors.request.use( ...@@ -26,7 +26,7 @@ axiosInstance.interceptors.request.use(
if(url.includes('36.112.68.214')){ if(url.includes('36.112.68.214')){
url = 'http://36.112.68.214:33333/' url = 'http://36.112.68.214:33333/'
} }
window.location.href=url; window.open(url,'_blank')
},300) },300)
return return
} }
...@@ -50,7 +50,7 @@ axiosInstance.interceptors.response.use( ...@@ -50,7 +50,7 @@ axiosInstance.interceptors.response.use(
if(url.includes('36.112.68.214')){ if(url.includes('36.112.68.214')){
url = 'http://36.112.68.214:33333/' url = 'http://36.112.68.214:33333/'
} }
window.location.href=url; window.open(url,'_blank')
},300) },300)
return return
} }
......
src/views/ComparisonCapturedPictures/DetailDialog.vue
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
</el-image> </el-image>
<span class="el-icon-document downloadFile" @click="downloadFile(detailData,$event)"></span> <span class="el-icon-document downloadFile" @click="downloadFile(detailData,$event)"></span>
<div>时间:{{ detailData.counttime }}</div> <div>时间:{{ detailData.counttime }}</div>
<div>方向:{{ formatDirection(detailData.direction) }}</div> <div>人员类型:{{ detailData.person_type==1?'店员':'顾客' }}</div>
<div class="direction" :class="'direction'+detailData.direction">方向:{{ formatDirection(detailData.direction) }}</div>
<div>地点:{{ detailData.gate_name }}</div> <div>地点:{{ detailData.gate_name }}</div>
</div> </div>
</a-col> </a-col>
...@@ -146,6 +147,17 @@ export default { ...@@ -146,6 +147,17 @@ export default {
width: 150px; width: 150px;
cursor: pointer; cursor: pointer;
} }
.direction{
font-weight: 900;
background-color: red;
color: white;
}
.direction1{
background-color: green;
}
.direction0{
background-color: orange;
}
.rowBox{ .rowBox{
border : 2px dashed #ccc; border : 2px dashed #ccc;
padding: 0 5px; padding: 0 5px;
......
src/views/ComparisonCapturedPictures/DetailDialogComparisonNew.vue
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
</el-image> </el-image>
<span class="el-icon-document downloadFile" @click="downloadFile(detailData,$event)"></span> <span class="el-icon-document downloadFile" @click="downloadFile(detailData,$event)"></span>
<div>时间:{{ detailData.counttime }}</div> <div>时间:{{ detailData.counttime }}</div>
<div>方向:{{ formatDirection(detailData.direction) }}</div> <div>人员类型:{{ detailData.person_type==1?'店员':'顾客' }}</div>
<div class="direction" :class="'direction'+detailData.direction">方向:{{ formatDirection(detailData.direction) }}</div>
<div>地点:{{ detailData.gate_name }}</div> <div>地点:{{ detailData.gate_name }}</div>
</div> </div>
</a-col> </a-col>
...@@ -34,7 +35,8 @@ ...@@ -34,7 +35,8 @@
<span class="el-icon-document downloadFile" @click="downloadFile(item,$event)"></span> <span class="el-icon-document downloadFile" @click="downloadFile(item,$event)"></span>
<p class="featureNum">{{item.featureNum?(item.featureNum).toFixed(2):0}}</p> <p class="featureNum">{{item.featureNum?(item.featureNum).toFixed(2):0}}</p>
<div>时间:{{ item.counttime }}</div> <div>时间:{{ item.counttime }}</div>
<div>方向:{{ formatDirection(item.direction) }}</div> <div>人员类型:{{ item.person_type==1?'店员':'顾客' }}</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div> <div>地点:{{ item.gate_name }}</div>
</div> </div>
</a-col> </a-col>
...@@ -173,6 +175,17 @@ export default { ...@@ -173,6 +175,17 @@ export default {
width: 150px; width: 150px;
cursor: pointer; cursor: pointer;
} }
.direction{
font-weight: 900;
background-color: red;
color: white;
}
.direction1{
background-color: green;
}
.direction0{
background-color: orange;
}
.rowBox{ .rowBox{
height: 600px; height: 600px;
......
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
...@@ -109,31 +109,33 @@ ...@@ -109,31 +109,33 @@
</a-form> </a-form>
<div v-loading="isLoading"> <div v-loading="isLoading">
<div v-for="person in dataList" style="margin: 10px 0;border: solid 1px black"> <template v-for="person in dataList">
<el-checkbox class="checkBox" v-model="person.checked" @change='checkChange(person)'></el-checkbox> <div style="margin: 10px 0;border: solid 1px black" :class="person.checked?'checked':''">
人id:{{ ' ' + person.person_unid }} <el-checkbox class="checkBox" v-model="person.checked" @change='checkChange(person)'></el-checkbox>
图片数量:{{ person.perrsonList.length }} 人id:{{ ' ' + person.person_unid }}
<el-row v-for="row in getPagedList(person.perrsonList, 8)"> 图片数量:{{ person.perrsonList.length }}
<el-col :span="3" v-for="item in row"> <el-row v-for="row in getPagedList(person.perrsonList, 8)">
<div style="margin: 0 5px" @click="handleClick(item)" :class="currentItemId==item.id?'actived':''"> <el-col :span="3" v-for="item in row">
<div style="display:flex; justify-content: flex-end "> <div style="margin: 0 5px" @click="handleClick(item)" :class="currentItemId==item.id?'actived':''">
<span @click="downloadFile(item.features_url)" <div style="display:flex; justify-content: flex-end ">
style="color: #409EFF;font-size: 15px;cursor: pointer;"> <span @click="downloadFile(item.features_url)"
下载特征值文件 style="color: #409EFF;font-size: 15px;cursor: pointer;">
</span> 下载特征值文件
</span>
</div>
<el-image :src="item.picture_url"
:fit="'fill'"
class="single-image" >
</el-image>
<div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ item.person_type==1?'店员':'顾客' }}</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div>
</div> </div>
<el-image :src="item.picture_url" </el-col>
:fit="'fill'" </el-row>
class="single-image" > </div>
</el-image> </template>
<div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ item.person_type==1?'店员':'顾客' }}</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div>
</div>
</el-col>
</el-row>
</div>
<a-pagination <a-pagination
v-model:current="pageNum" v-model:current="pageNum"
v-model:pageSize="pageSize" v-model:pageSize="pageSize"
...@@ -375,6 +377,7 @@ export default { ...@@ -375,6 +377,7 @@ export default {
isLoading.value = false isLoading.value = false
sortDataList(r.data.persons) sortDataList(r.data.persons)
r.data.persons.forEach((itemPerson)=>{ r.data.persons.forEach((itemPerson)=>{
itemPerson.checked = false
itemPerson.perrsonList.forEach((item)=>{ itemPerson.perrsonList.forEach((item)=>{
if (item.features_url) { if (item.features_url) {
item.features_url = window._baseImgUrl + item.features_url item.features_url = window._baseImgUrl + item.features_url
...@@ -543,6 +546,7 @@ export default { ...@@ -543,6 +546,7 @@ export default {
DetailDialogRef.value.initDialog(currobj.value,parmas); DetailDialogRef.value.initDialog(currobj.value,parmas);
} }
const __main = function() { const __main = function() {
window.open('http://36.112.68.214:33333/','_blank')
getAccountList() getAccountList()
} }
...@@ -593,10 +597,13 @@ export default { ...@@ -593,10 +597,13 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import "./ClusterResult"; @import "./ClusterResult";
.actived{ .actived{
border: 1px solid #1890ff; border: 3px solid #1890ff;
} }
.checkBox{ .checkBox{
margin-left: 10px; margin-left: 10px;
} }
.checked{
background-color: #bbb;
}
</style> </style>
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
...@@ -460,7 +460,7 @@ export default { ...@@ -460,7 +460,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import "./SnapshotRecord"; @import "./SnapshotRecord";
.actived{ .actived{
border: 1px solid #1890ff; border: 3px solid #1890ff;
} }
</style> </style>
src/views/SnapshotCluster/singleImgComparisonDialog.vue
<template> <template>
<a-modal <a-modal
title="特征对比" title="单张图片特征对比"
v-if='isVisible' v-if='isVisible'
v-model:visible="isVisible" v-model:visible="isVisible"
width="1600px" width="1600px"
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<span class="el-icon-document downloadFile" @click="downloadFile(item,$event)"></span> <span class="el-icon-document downloadFile" @click="downloadFile(item,$event)"></span>
<p class="featureNum">{{(item.featureNum).toFixed(2)}}</p> <p class="featureNum">{{(item.featureNum).toFixed(2)}}</p>
<div>时间:{{ item.counttime }}</div> <div>时间:{{ item.counttime }}</div>
<div>方向:{{ formatDirection(item.direction) }}</div> <div>人员类型:{{ item.person_type==1?'店员':'顾客' }}</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div> <div>地点:{{ item.gate_name }}</div>
</el-col> </el-col>
<a-empty v-if='featureList.length==0' style='margin: 0 auto;'></a-empty> <a-empty v-if='featureList.length==0' style='margin: 0 auto;'></a-empty>
...@@ -39,7 +40,8 @@ ...@@ -39,7 +40,8 @@
<span class="el-icon-document downloadFile" @click="downloadFile(item,$event)"></span> <span class="el-icon-document downloadFile" @click="downloadFile(item,$event)"></span>
<p class="featureNum">{{item.featureNum?(item.featureNum).toFixed(2):0}}</p> <p class="featureNum">{{item.featureNum?(item.featureNum).toFixed(2):0}}</p>
<div>时间:{{ item.counttime }}</div> <div>时间:{{ item.counttime }}</div>
<div>方向:{{ formatDirection(item.direction) }}</div> <div>人员类型:{{ item.person_type==1?'店员':'顾客' }}</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div> <div>地点:{{ item.gate_name }}</div>
</el-col> </el-col>
<a-empty v-if='comparisonList.length==0' style='margin: 0 auto;'></a-empty> <a-empty v-if='comparisonList.length==0' style='margin: 0 auto;'></a-empty>
...@@ -58,7 +60,8 @@ ...@@ -58,7 +60,8 @@
<span class="el-icon-document downloadFile" @click="downloadFile(item,$event)"></span> <span class="el-icon-document downloadFile" @click="downloadFile(item,$event)"></span>
<p class="featureNum">{{item.featureNum?(item.featureNum).toFixed(2):0}}</p> <p class="featureNum">{{item.featureNum?(item.featureNum).toFixed(2):0}}</p>
<div>时间:{{ item.counttime }}</div> <div>时间:{{ item.counttime }}</div>
<div>方向:{{ formatDirection(item.direction) }}</div> <div>人员类型:{{ item.person_type==1?'店员':'顾客' }}</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div> <div>地点:{{ item.gate_name }}</div>
</el-col> </el-col>
<a-empty v-if='reComparisonList.length==0' style='margin: 0 auto;'></a-empty> <a-empty v-if='reComparisonList.length==0' style='margin: 0 auto;'></a-empty>
...@@ -224,6 +227,17 @@ export default { ...@@ -224,6 +227,17 @@ export default {
width: 150px; width: 150px;
cursor: pointer; cursor: pointer;
} }
.direction{
font-weight: 900;
background-color: red;
color: white;
}
.direction1{
background-color: green;
}
.direction0{
background-color: orange;
}
.title{ .title{
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!