Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit 7e5f5b88 by 李乾广
Options

修改bug

1 parent a9d54b2e
Inline Side-by-side
Showing 4 changed files with 29 additions and 18 deletions
src/Request/PublicAxiosInstance.js
...@@ -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','8246b767-9f23-47ac-bf2c-ef0ddfe8d629') // Cookies.set('atoken','a3a6c854-56b7-452f-bf01-744a7acf3adf')
if(!Cookies.get('atoken')){ if(!Cookies.get('atoken')){
ElMessage({ ElMessage({
message: `登录过期，请重新登录`, message: `登录过期，请重新登录`,
......
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
<a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" style="width: 240px"/> <a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" style="width: 240px"/>
</a-form-item> </a-form-item>
<a-form-item label="选择时间：" style="padding: 5px 0"> <a-form-item label="选择时间：" style="padding: 5px 0">
<a-time-picker v-model:value="queryForm.startTime" style="width: 140px"/> <a-time-picker format="HH:mm:ss" valueFormat="HH:mm:ss" v-model:value="queryForm.startTime" style="width: 140px"/>
<a-time-picker v-model:value="queryForm.endTime" style="width: 140px"/> <a-time-picker format="HH:mm:ss" valueFormat="HH:mm:ss" v-model:value="queryForm.endTime" style="width: 140px"/>
</a-form-item> </a-form-item>
<a-form-item label="图片数量：" style="padding: 5px 0"> <a-form-item label="图片数量：" style="padding: 5px 0">
<a-input v-model:value="queryForm.minPic" style="width: 129px"/> <a-input v-model:value="queryForm.minPic" style="width: 129px"/>
...@@ -432,8 +432,8 @@ export default { ...@@ -432,8 +432,8 @@ export default {
direction: rawData.direction.toString(), direction: rawData.direction.toString(),
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType.toString(), personType: rawData.personType.toString(),
startTime: formatDate(rawData.date) + ' ' + formatTime(rawData.startTime), startTime: formatDate(rawData.date) + ' ' + rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + formatTime(rawData.endTime), endTime: formatDate(rawData.date) + ' ' + rawData.endTime,
minPic: rawData.minPic, minPic: rawData.minPic,
maxPic: rawData.maxPic, maxPic: rawData.maxPic,
page: pageNum.value - 1, page: pageNum.value - 1,
...@@ -454,8 +454,8 @@ export default { ...@@ -454,8 +454,8 @@ export default {
date: rawData.date, date: rawData.date,
minPic: rawData.minPic, minPic: rawData.minPic,
maxPic: rawData.maxPic, maxPic: rawData.maxPic,
startTime: formatDate(rawData.date) + ' ' + formatTime(rawData.startTime), startTime: formatDate(rawData.date) + ' ' + rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + formatTime(rawData.endTime), endTime: formatDate(rawData.date) + ' ' + rawData.endTime,
} }
) )
window.localStorage.setItem('searchCondition',JSON.stringify(storageData)) window.localStorage.setItem('searchCondition',JSON.stringify(storageData))
...@@ -627,11 +627,13 @@ export default { ...@@ -627,11 +627,13 @@ export default {
return return
} }
const rawData = toRaw(queryForm) const rawData = toRaw(queryForm)
console.log(queryForm)
console.log(rawData)
let parmas = { let parmas = {
person_unid:currobj.value.person_unid, person_unid:currobj.value.person_unid,
pic_type:rawData.picType, pic_type:rawData.picType,
endTime:formatDate(rawData.date) + ' 23:59:59', endTime:formatDate(rawData.date) + ' ' + rawData.endTime,
startTime:formatDate(rawData.date) + ' 00:00:00', startTime:formatDate(rawData.date) + ' ' + rawData.startTime,
countdate:formatDate(rawData.date), countdate:formatDate(rawData.date),
pic_id:currobj.value.id, pic_id:currobj.value.id,
ip:window._baseImgUrl, ip:window._baseImgUrl,
......
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
<a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" style="width: 280px"/> <a-date-picker v-model:value="queryForm.date" :format="'YYYY-MM-DD'" style="width: 280px"/>
</a-form-item> </a-form-item>
<a-form-item label="选择时间：" style="padding: 5px 0"> <a-form-item label="选择时间：" style="padding: 5px 0">
<a-time-picker v-model:value="queryForm.startTime" style="width: 140px"/> <a-time-picker format="HH:mm:ss" valueFormat="HH:mm:ss" v-model:value="queryForm.startTime" style="width: 140px"/>
<a-time-picker v-model:value="queryForm.endTime" style="width: 140px"/> <a-time-picker format="HH:mm:ss" valueFormat="HH:mm:ss" 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="clickSearch" :loading="isLoading">查询</a-button> <a-button type="primary" @click="clickSearch" :loading="isLoading">查询</a-button>
...@@ -396,8 +396,8 @@ export default { ...@@ -396,8 +396,8 @@ export default {
direction: rawData.direction.toString(), direction: rawData.direction.toString(),
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType.toString(), personType: rawData.personType.toString(),
startTime: formatDate(rawData.date) + ' ' + formatTime(rawData.startTime), startTime: formatDate(rawData.date) + ' ' + rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + formatTime(rawData.endTime), endTime: formatDate(rawData.date) + ' ' + rawData.endTime,
page: pageNum.value - 1, page: pageNum.value - 1,
pageSize: pageSize.value, pageSize: pageSize.value,
childAdult: rawData.childAdult.toString(), childAdult: rawData.childAdult.toString(),
...@@ -414,8 +414,8 @@ export default { ...@@ -414,8 +414,8 @@ export default {
picType: rawData.picType, picType: rawData.picType,
personType: rawData.personType, personType: rawData.personType,
date: rawData.date, date: rawData.date,
startTime: formatDate(rawData.date) + ' ' + formatTime(rawData.startTime), startTime: formatDate(rawData.date) + ' ' +rawData.startTime,
endTime: formatDate(rawData.date) + ' ' + formatTime(rawData.endTime), endTime: formatDate(rawData.date) + ' ' + rawData.endTime,
} }
) )
window.localStorage.setItem('searchCondition',JSON.stringify(storageData)) window.localStorage.setItem('searchCondition',JSON.stringify(storageData))
...@@ -540,11 +540,12 @@ export default { ...@@ -540,11 +540,12 @@ export default {
return return
} }
const rawData = toRaw(queryForm) const rawData = toRaw(queryForm)
console.log(rawData)
let parmas = { let parmas = {
person_unid:currobj.value.person_unid, person_unid:currobj.value.person_unid,
pic_type:rawData.picType, pic_type:rawData.picType,
endTime:formatDate(rawData.date) + ' 23:59:59', endTime:formatDate(rawData.date) + ' ' + rawData.endTime,
startTime:formatDate(rawData.date) + ' 00:00:00', startTime:formatDate(rawData.date) + ' ' + rawData.startTime,
countdate:formatDate(rawData.date), countdate:formatDate(rawData.date),
pic_id:currobj.value.id, pic_id:currobj.value.id,
ip:window._baseImgUrl, ip:window._baseImgUrl,
......
src/views/SnapshotCluster/singleImgComparisonDialog.vue
...@@ -136,7 +136,15 @@ ...@@ -136,7 +136,15 @@
detailData.value = data; detailData.value = data;
featureList.value = [] featureList.value = []
reComparisonList.value = [] reComparisonList.value = []
featureApi.getPersonContrastList(data).then((r1) => { let par = {
person_unid:data.person_unid,
pic_type:data.pic_type,
countdate:data.countdate,
pic_id:data.pic_id,
ip:data.ip,
plaza_id:data.plaza_id,
}
featureApi.getPersonContrastList(par).then((r1) => {
isLoading.value = false isLoading.value = false
if (r1.data && isArray(r1.data.personList)) { if (r1.data && isArray(r1.data.personList)) {
r1.data.personList.forEach((item) => { r1.data.personList.forEach((item) => {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!