Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 9351d021 by 李君
Options

抓拍图片对比优化

1 parent 0b4aeb0c
Expand all
Inline Side-by-side
Showing 4 changed files with 14 additions and 9 deletions
public/config.js
window._serverHost = ['localhost', '192.168.1.168'].includes(window.location.hostname) ? '36.112.68.214:9999' : window.location.host window._serverHost = ['localhost', '192.168.1.168'].includes(window.location.hostname) ? '36.112.68.214:9999' : window.location.host
window._baseUrl = ['localhost', '192.168.1.168'].includes(window.location.hostname) ? 'http://36.112.68.214:9999/tool/' : `http://${window._serverHost}/tool/` window._baseUrl = ['localhost', '192.168.1.168'].includes(window.location.hostname) ? 'http://36.112.68.214:9999/tool/' : `http://${window._serverHost}/tool/`
window._baseImgUrl = ['localhost', '192.168.1.168'].includes(window.location.hostname) ? 'http://36.112.68.214:9999/' : `${window.location.origin}/` window._baseImgUrl = ['localhost', '192.168.1.168'].includes(window.location.hostname) ? 'http://36.112.68.214:9999/images/' : `${window.location.origin}/images/`
const log = console.log.bind(console) const log = console.log.bind(console)
src/views/ComparisonCapturedPictures/DetailDialogComparison.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</a-col> </a-col>
<a-col :span='20'> <a-col :span='20'>
<div v-loading='isLoadingTop' class='rowBox'> <div v-loading='isLoadingTop' class='rowBox'>
<p v-if="dataListLeft">左侧<span style="float: right;margin-right: 25px;" v-if="dataListLeft.length">共{{dataListLeft.length}}张</span></p> <p v-if="dataListLeft">上方<span style="float: right;margin-right: 25px;" v-if="dataListLeft.length">共{{dataListLeft.length}}张</span></p>
<a-row > <a-row >
<a-col :span="6" v-for="(item,index) in dataListLeft" :key='index'> <a-col :span="6" v-for="(item,index) in dataListLeft" :key='index'>
<div style="margin: 0 5px" class="itemBox"> <div style="margin: 0 5px" class="itemBox">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</a-row> </a-row>
</div> </div>
<div v-loading='isLoadingBottom' class='rowBox'> <div v-loading='isLoadingBottom' class='rowBox'>
<p v-if="dataListRight">右侧<span style="float: right;margin-right: 25px;" v-if="dataListRight.length">共{{dataListRight.length}}张</span></p> <p v-if="dataListRight">下方<span style="float: right;margin-right: 25px;" v-if="dataListRight.length">共{{dataListRight.length}}张</span></p>
<a-row> <a-row>
<a-col :span="6" v-for="(item,index) in dataListRight" :key='index'> <a-col :span="6" v-for="(item,index) in dataListRight" :key='index'>
<div style="margin: 0 5px" class="itemBox"> <div style="margin: 0 5px" class="itemBox">
...@@ -83,6 +83,7 @@ export default { ...@@ -83,6 +83,7 @@ export default {
countdate:parmas.countdate, countdate:parmas.countdate,
personList:parmas.persionlistLeft personList:parmas.persionlistLeft
} }
console.log(parmasObj)
comparsionResultApi.getPersonContrastList(parmasObj).then((r) => { comparsionResultApi.getPersonContrastList(parmasObj).then((r) => {
isLoadingTop.value = false isLoadingTop.value = false
if (r.data&&isArray(r.data.personList)) { if (r.data&&isArray(r.data.personList)) {
......
src/views/FeatureComparisonVerification/FeatureComparisonVerification.vue
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</a-form> </a-form>
<div v-loading="isLoading"> <div v-loading="isLoading">
<el-row v-for="row in pagedTableDataList"> <el-row v-for="row in pagedTableDataList">
<el-col :span="6" v-for="(item,index) in row" :key="index"> <el-col class="col" :span="6" v-for="(item,index) in row" :key="index">
<div style="margin: 0 5px" @click='chooseItem(item)' class="colItem" :class="currentItemId==item.id?'actived':''"> <div style="margin: 0 5px" @click='chooseItem(item)' class="colItem" :class="currentItemId==item.id?'actived':''">
<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>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</el-col> </el-col>
</el-row> </el-row>
<a-pagination v-model:current="pageNum" v-model:pageSize="pageSize" :total="total" <a-pagination v-model:current="pageNum" v-model:pageSize="pageSize" :total="total"
:show-total="total => `共 ${total} 条`" :pageSizeOptions="['12', '24', '48', '192']" :show-total="total => `共 ${total} 条`" :pageSizeOptions="['10', '20']"
@change="onPageNumChange" @showSizeChange="onPageSizeChange" show-size-changer show-quick-jumper @change="onPageNumChange" @showSizeChange="onPageSizeChange" show-size-changer show-quick-jumper
style="text-align:center" /> style="text-align:center" />
</div> </div>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<a-col :span="10" class='imgBox1'> <a-col :span="10" class='imgBox1'>
<p style="margin-left: 15px;" v-if='featureList.length>0'>共{{featureList.length}}张</p> <p style="margin-left: 15px;" v-if='featureList.length>0'>共{{featureList.length}}张</p>
<el-row class="imgBox1_top" :gutter="10" v-loading="isLoadingFeature"> <el-row class="imgBox1_top" :gutter="10" v-loading="isLoadingFeature">
<el-col :span="8" 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>
<p class="featureNum">{{(item.featureNum).toFixed(2)}}</p> <p class="featureNum">{{(item.featureNum).toFixed(2)}}</p>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<a-button type="primary" @click="reComparisonFeature" >重提特征比对</a-button> <a-button type="primary" @click="reComparisonFeature" >重提特征比对</a-button>
</div> </div>
<el-row :gutter="10" v-loading="isLoadingComparison" class='imgBox2'> <el-row :gutter="10" v-loading="isLoadingComparison" class='imgBox2'>
<el-col :span="8" 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>
<p class="featureNum">{{(item.featureNum).toFixed(2)}}</p> <p class="featureNum">{{(item.featureNum).toFixed(2)}}</p>
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
setup() { setup() {
// scalar // scalar
const pageNum = ref(1) const pageNum = ref(1)
const pageSize = ref(12) const pageSize = ref(10)
const total = ref() const total = ref()
const isLoading = ref(false) const isLoading = ref(false)
// sequence // sequence
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
const isLoadingFeature = ref(false) const isLoadingFeature = ref(false)
const pagedTableDataList = computed( const pagedTableDataList = computed(
() => { () => {
return getPagedList(dataList.value, 8) return getPagedList(dataList.value, 10)
} }
) )
...@@ -519,6 +519,10 @@ ...@@ -519,6 +519,10 @@
padding-left: 5px; padding-left: 5px;
} }
} }
.col{
flex: 0 0 20%;
max-width: 20%;
}
.actived{ .actived{
border: 1px solid #1890ff; border: 1px solid #1890ff;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!