Commit 1b1ea748 by 李君

优化

1 parent 0c5891f2
...@@ -14,7 +14,7 @@ const axiosInstance = axios.create( ...@@ -14,7 +14,7 @@ const axiosInstance = axios.create(
// 请求拦截器 // 请求拦截器
axiosInstance.interceptors.request.use( axiosInstance.interceptors.request.use(
config => { config => {
// Cookies.set('atoken','acea42b1-2da3-4cbb-b2b0-ed6603cb6448') // Cookies.set('atoken','e0386268-5563-442d-8ef8-af92580d6903')
if(!Cookies.get('atoken')){ if(!Cookies.get('atoken')){
ElMessage({ ElMessage({
message: `登录过期,请重新登录`, message: `登录过期,请重新登录`,
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<a-input-number v-model:value="queryForm.maxPic" :min="0" style="width: 100px"/> <a-input-number v-model:value="queryForm.maxPic" :min="0" style="width: 100px"/>
</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="confirmSearch" :loading="isLoading">查询</a-button> <a-button type="primary" @click="clickSearch" :loading="isLoading">查询</a-button>
</a-form-item> </a-form-item>
</a-form> </a-form>
<div v-loading="isLoading"> <div v-loading="isLoading">
...@@ -354,7 +354,10 @@ ...@@ -354,7 +354,10 @@
} }
) )
} }
const clickSearch = function() {
pageNum.value = 1
confirmSearch()
}
const confirmSearch = function() { const confirmSearch = function() {
const rawData = toRaw(queryForm) const rawData = toRaw(queryForm)
if(rawData.minPic>rawData.maxPic){ if(rawData.minPic>rawData.maxPic){
...@@ -670,6 +673,7 @@ ...@@ -670,6 +673,7 @@
onPlazaChange, onPlazaChange,
onZoneChange, onZoneChange,
confirmSearch, confirmSearch,
clickSearch,
formatDirection, formatDirection,
formatPersonType, formatPersonType,
dragStart, dragStart,
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<a-time-picker v-model:value="queryForm.endTime" style="width: 100px" /> <a-time-picker v-model:value="queryForm.endTime" style="width: 100px" />
</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="confirmSearch" :loading="isLoading">查询</a-button> <a-button type="primary" @click="clickSearch" :loading="isLoading">查询</a-button>
</a-form-item> </a-form-item>
</a-form> </a-form>
<div v-loading="isLoading"> <div v-loading="isLoading">
...@@ -407,7 +407,10 @@ ...@@ -407,7 +407,10 @@
} }
) )
} }
const clickSearch = function() {
pageNum.value = 1
confirmSearch()
}
const confirmSearch = function() { const confirmSearch = function() {
isLoading.value = true isLoading.value = true
const rawData = toRaw(queryForm) const rawData = toRaw(queryForm)
...@@ -715,7 +718,8 @@ ...@@ -715,7 +718,8 @@
openImage, openImage,
deleteImage, deleteImage,
addImage, addImage,
fullScreen fullScreen,
clickSearch
} }
} }
} }
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<a-input v-model:value="queryForm.maxPic" style="width: 129px"/> <a-input v-model:value="queryForm.maxPic" style="width: 129px"/>
</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="confirmSearch" :loading="isLoading">查询</a-button> <a-button type="primary" @click="clickSearch" :loading="isLoading">查询</a-button>
</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="comparativeFun">特征对比</a-button> <a-button type="primary" @click="comparativeFun">特征对比</a-button>
...@@ -396,7 +396,10 @@ export default { ...@@ -396,7 +396,10 @@ export default {
} }
) )
} }
const clickSearch = function() {
pageNum.value = 1
confirmSearch()
}
const confirmSearch = function() { const confirmSearch = function() {
isLoading.value = true isLoading.value = true
const rawData = toRaw(queryForm) const rawData = toRaw(queryForm)
...@@ -456,6 +459,7 @@ export default { ...@@ -456,6 +459,7 @@ export default {
}) })
dataList.value = r.data.persons dataList.value = r.data.persons
total.value = r.data.pageNum total.value = r.data.pageNum
document.getElementsByClassName('resultContent')[0].scrollTop = 0
} }
) )
} }
...@@ -678,6 +682,7 @@ export default { ...@@ -678,6 +682,7 @@ export default {
singleComparativeFun, singleComparativeFun,
formatGender, formatGender,
downloadTrajectoryFile, downloadTrajectoryFile,
clickSearch,
// ref // ref
// imgModelRef, // imgModelRef,
DetailDialogRef, DetailDialogRef,
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<a-time-picker v-model:value="queryForm.endTime" style="width: 140px"/> <a-time-picker v-model:value="queryForm.endTime" style="width: 140px"/>
</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="confirmSearch" :loading="isLoading">查询</a-button> <a-button type="primary" @click="clickSearch" :loading="isLoading">查询</a-button>
</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="comparativeFun">特征对比验证</a-button> <a-button type="primary" @click="comparativeFun">特征对比验证</a-button>
...@@ -416,6 +416,7 @@ export default { ...@@ -416,6 +416,7 @@ export default {
}) })
dataList.value = r.data.persons dataList.value = r.data.persons
total.value = r.data.pageNum total.value = r.data.pageNum
document.getElementsByClassName('resultContent')[0].scrollTop = 0
} }
) )
} }
...@@ -498,6 +499,10 @@ export default { ...@@ -498,6 +499,10 @@ export default {
} }
DetailDialogRef.value.initDialog(currobj.value,parmas); DetailDialogRef.value.initDialog(currobj.value,parmas);
} }
const clickSearch = function() {
pageNum.value = 1
confirmSearch()
}
const contentHeight = ref(0) const contentHeight = ref(0)
const __main = function() { const __main = function() {
getAccountList() getAccountList()
...@@ -536,6 +541,7 @@ export default { ...@@ -536,6 +541,7 @@ export default {
handleClick, handleClick,
comparativeFun, comparativeFun,
formatGender, formatGender,
clickSearch,
// ref // ref
DetailDialogRef, DetailDialogRef,
imgModelRef imgModelRef
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!