Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit e37ff087 by 李君
Options

优化

1 parent da553829
Inline Side-by-side
Showing 3 changed files with 51 additions and 16 deletions
src/Request/PublicAxiosInstance.js
...@@ -14,8 +14,7 @@ const axiosInstance = axios.create( ...@@ -14,8 +14,7 @@ const axiosInstance = axios.create(
// 请求拦截器 // 请求拦截器
axiosInstance.interceptors.request.use( axiosInstance.interceptors.request.use(
config => { config => {
// Cookies.set('atoken','ff2abb3b-667c-4d0f-b9f9-7121a229a416')
// Cookies.set('atoken','718de41a-617b-4cc8-a6ae-ca3acce9b62e')
if(!Cookies.get('atoken')){ if(!Cookies.get('atoken')){
ElMessage({ ElMessage({
message: `登录过期，请重新登录`, message: `登录过期，请重新登录`,
......
src/views/ComparisonCapturedPictures/ComparisonCapturedPictures.vue
...@@ -301,7 +301,6 @@ ...@@ -301,7 +301,6 @@
} }
const getGateList = function(val) { const getGateList = function(val) {
queryForm.gate_id = []
gateList.value = [] gateList.value = []
snapshotRecordApi.getGateList({ snapshotRecordApi.getGateList({
account_id: queryForm.account_id.toString(), account_id: queryForm.account_id.toString(),
......
src/views/FeatureComparisonVerification/FeatureComparisonVerification.vue
...@@ -83,11 +83,14 @@ ...@@ -83,11 +83,14 @@
</div> </div>
</a-col> </a-col>
<a-col :span="10" class='imgBox1'> <a-col :span="10" class='imgBox1'>
<p v-if='featureList.length>0' style="margin-left: 15px;"> <div class="imgBox1_top1">
<p v-if="featureList.length>0" style="margin-left: 15px;">
<a-button type="primary" style="float: right;" @click="fullScreen('imgBox1_top1')" >{{!isFull?'全屏':'退出'}}</a-button>
<span>{{featureList[0].person_unid}}</span> <span>{{featureList[0].person_unid}}</span>
<span style="float: right;">共{{featureList.length}}张</span> <span style="float: right;margin-right: 15px;">共{{featureList.length}}张</span>
</p> </p>
<el-row class="imgBox1_top" :gutter="10" v-loading="isLoadingFeature">
<el-row class="imgBox1_top" :gutter="10" v-loading="isLoadingFeature" :style="{'max-height':!isFull?'500px':'90%'}">
<el-col :span="6" class="itemBox" v-for="item in featureList"> <el-col :span="6" class="itemBox" v-for="item in featureList">
<el-image :src="item.picture_url" :fit="'fill'" class="single-image"> <el-image :src="item.picture_url" :fit="'fill'" class="single-image">
</el-image> </el-image>
...@@ -101,6 +104,7 @@ ...@@ -101,6 +104,7 @@
</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>
</el-row> </el-row>
</div>
<div class="imgBox2_top" > <div class="imgBox2_top" >
<div class="btns"> <div class="btns">
<p v-if='comparisonList.length>0' style="margin-left: 15px;float: left"> <p v-if='comparisonList.length>0' style="margin-left: 15px;float: left">
...@@ -110,8 +114,9 @@ ...@@ -110,8 +114,9 @@
阈值：<el-input-number class="thresholdInput" size="small" :controls='false' :min="1" :max="100" v-model="threshold"></el-input-number> 阈值：<el-input-number class="thresholdInput" size="small" :controls='false' :min="1" :max="100" v-model="threshold"></el-input-number>
<a-button type="primary" @click="reComparison" >重新比对</a-button> <a-button type="primary" @click="reComparison" >重新比对</a-button>
<a-button type="primary" @click="reComparisonFeature" >重提特征比对</a-button> <a-button type="primary" @click="reComparisonFeature" >重提特征比对</a-button>
<a-button type="primary" @click="fullScreen('imgBox2_top')" >{{!isFull?'全屏':'退出'}}</a-button>
</div> </div>
<el-row :gutter="10" v-loading="isLoadingComparison" class='imgBox2'> <el-row :gutter="10" v-loading="isLoadingComparison" class='imgBox2' :style="{'max-height':!isFull?'500px':'90%'}">
<el-col :span="6" class="itemBox" v-for="item in comparisonList"> <el-col :span="6" class="itemBox" v-for="item in comparisonList">
<el-image :src="item.picture_url" :fit="'fill'" class="single-image"> <el-image :src="item.picture_url" :fit="'fill'" class="single-image">
</el-image> </el-image>
...@@ -179,6 +184,7 @@ ...@@ -179,6 +184,7 @@
const boxObj = ref({}) const boxObj = ref({})
const currentItemId = ref() const currentItemId = ref()
const isLoadingFeature = ref(false) const isLoadingFeature = ref(false)
const isFull = ref(false)
const threshold = ref(75) const threshold = ref(75)
const pagedTableDataList = computed( const pagedTableDataList = computed(
() => { () => {
...@@ -567,7 +573,9 @@ ...@@ -567,7 +573,9 @@
event.stopPropagation() event.stopPropagation()
featureApi.updateImage({ featureApi.updateImage({
'personUnid':item.unid, 'personUnid':item.unid,
'id':item.id 'id':item.id,
'unid':item.unid,
'countdate':item.counttime?item.counttime:'',
}).then((r) => { }).then((r) => {
if(r.msg_code==200){ if(r.msg_code==200){
ElMessage( ElMessage(
...@@ -584,7 +592,9 @@ ...@@ -584,7 +592,9 @@
event.stopPropagation() event.stopPropagation()
featureApi.updateImage({ featureApi.updateImage({
'personUnid':boxObj.value.person_unid, 'personUnid':boxObj.value.person_unid,
'id':item.id 'id':item.id,
'unid':item.unid,
'countdate':item.counttime?item.counttime:'',
}).then((r) => { }).then((r) => {
if(r.msg_code==200){ if(r.msg_code==200){
ElMessage( ElMessage(
...@@ -599,7 +609,28 @@ ...@@ -599,7 +609,28 @@
}) })
} }
__main() __main()
const fullScreen = function(className){
var de = document.getElementsByClassName(className)[0];
if(isFull.value){
if(document.exitFullscreen) {
document.exitFullscreen();
} else if(document.mozCancelFullScreen) {
document.mozCancelFullScreen();
} else if(document.webkitExitFullscreen) {
document.webkitExitFullscreen();
}
}else{
if (de.requestFullscreen) {
de.requestFullscreen();
} else if (de.mozRequestFullScreen) {
de.mozRequestFullScreen();
} else if (de.webkitRequestFullScreen) {
de.webkitRequestFullScreen();
}
}
isFull.value = !isFull.value
}
// const
return { return {
// scalar // scalar
isLoading, isLoading,
...@@ -611,6 +642,7 @@ ...@@ -611,6 +642,7 @@
currentItemId, currentItemId,
centerDialogVisible, centerDialogVisible,
otherPictureUrl, otherPictureUrl,
isFull,
// sequence // sequence
accountList, accountList,
plazaList, plazaList,
...@@ -637,7 +669,8 @@ ...@@ -637,7 +669,8 @@
downloadFile, downloadFile,
openImage, openImage,
deleteImage, deleteImage,
addImage addImage,
fullScreen
} }
} }
} }
...@@ -697,17 +730,17 @@ ...@@ -697,17 +730,17 @@
} }
.imgBox2{ .imgBox2{
min-height: 400px; min-height: 400px;
max-height: 500px; // max-height: 500px;
overflow-y: auto; overflow-y: auto;
} }
.imgBox1_top{ .imgBox1_top{
width: 100%; width: 100%;
min-height: 400px; min-height: 400px;
max-height: 500px; // max-height: 500px;
overflow-y: auto; overflow-y: auto;
border-bottom: 10px solid #efefef;
} }
.imgBox2_top{ .imgBox2_top{
border-top: 10px solid #efefef;
.btns{ .btns{
text-align: right; text-align: right;
margin-top: 10px; margin-top: 10px;
...@@ -715,6 +748,7 @@ ...@@ -715,6 +748,7 @@
} }
button{ button{
margin-right: 10px; margin-right: 10px;
padding: 4px 7px;
} }
} }
.colItem{ .colItem{
...@@ -748,7 +782,10 @@ ...@@ -748,7 +782,10 @@
border: 1px solid #1890ff; border: 1px solid #1890ff;
} }
.thresholdInput{ .thresholdInput{
width: 100px; width: 60px;
margin-right: 15px; // margin-right: 15px;
/deep/.el-input__inner{
text-align: left;
}
} }
</style> </style>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!