Commit 0ebf7ea3 by 陈岩

rebase: 建百货分支,master分支代码回退

1 parent 8642dc4a
......@@ -171,7 +171,7 @@ export default {
const getPlazaList = function() {
queryForm.plaza_id = []
plazaList.value = []
snapshotRecordApi.getPlazaListApi(
snapshotRecordApi.getPlazaList(
{
account_id: queryForm.account_id.toString()
}
......
......@@ -4,7 +4,7 @@
<!-- mode="multiple" -->
<a-select v-model:value="queryForm.account_id"
style="width: 280px"
:maxTagCount="1"
@change="onAccountChange"
:options="accountList"
......@@ -17,7 +17,7 @@
<!-- mode="multiple" -->
<a-select v-model:value="queryForm.plaza_id"
style="width: 280px"
:maxTagCount="1"
:options="plazaList"
optionFilterProp="label"
......@@ -60,7 +60,7 @@
<ResultDisplay :data="resultList" :key="resultList"></ResultDisplay>
</el-col>
</el-row>
</template>
<script>
......@@ -101,7 +101,7 @@ export default {
const getPlazaList = function() {
queryForm.plaza_id = []
plazaList.value = []
snapshotRecordApi.getPlazaListApi(
snapshotRecordApi.getPlazaList(
{
account_id: queryForm.account_id.toString()
}
......
......@@ -168,12 +168,12 @@
</a-form-item>
<a-form-item label="是否过滤" style="padding: 5px 0">
<a-radio-group v-model:value="queryForm.filter">
<a-radio :value="0">不过滤</a-radio>
<a-radio :value="1">过滤</a-radio>
</a-radio-group>
</a-form-item>
<!-- <a-form-item label="是否过滤" style="padding: 5px 0">-->
<!-- <a-radio-group v-model:value="queryForm.filter">-->
<!-- <a-radio :value="0">不过滤</a-radio>-->
<!-- <a-radio :value="1">过滤</a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-item>-->
<a-form-item style="padding: 5px 0">
<a-button type="primary" @click="clickSearch" :loading="isLoading">查询</a-button>
</a-form-item>
......@@ -268,7 +268,7 @@
class="downBtn">
轨迹
</span>
<span class="downBtn" v-if="item.direction === 1 || item.direction === -1" @click="handleShotSearch(person.perrsonList,item,rowIndex*8+index)">搜索抓拍</span>
<!-- <span class="downBtn" v-if="item.direction === 1 || item.direction === -1" @click="handleShotSearch(person.perrsonList,item,rowIndex*8+index)">搜索抓拍</span>-->
<span @click="downloadFile(item.features_url)"
class="downBtn downBtn1">
......@@ -550,7 +550,7 @@ export default {
queryForm.endTime = searchCondition.value.endTime;
queryForm.minPic = searchCondition.value.minPic||0;
queryForm.maxPic = searchCondition.value.maxPic||1000;
queryForm.filter = searchCondition.value.filter||0;
// queryForm.filter = searchCondition.value.filter||0;
}
// function
const onPageNumChange = function(num) {
......@@ -842,7 +842,7 @@ export default {
...storageData
}
window.localStorage.setItem('searchCondition',JSON.stringify(newSearchCondition))
data.filter = queryForm.filter
// data.filter = queryForm.filter
clusterResultApi.getClusterResultList(data).then(
(r) => {
isLoading.value = false
......
......@@ -63,7 +63,7 @@
const getPlazaList = function() {
queryForm.plaza_id = []
plazaList.value = []
snapshotRecordApi.getPlazaListApi({
snapshotRecordApi.getPlazaList({
account_id: queryForm.account_id.toString()
}).then(
(r) => {
......@@ -168,4 +168,4 @@
margin-bottom: 10px;
}
}
</style>
\ No newline at end of file
</style>
......@@ -71,7 +71,7 @@
const getPlazaList = function() {
queryForm.plaza_id = []
plazaList.value = []
snapshotRecordApi.getPlazaListApi({
snapshotRecordApi.getPlazaList({
account_id: queryForm.account_id.toString()
}).then(
(r) => {
......
......@@ -65,7 +65,7 @@
const getPlazaList = function() {
queryForm.plaza_id = ''
plazaList.value = []
snapshotRecordApi.getPlazaListApi({
snapshotRecordApi.getPlazaList({
account_id: queryForm.account_id
}).then(
(r) => {
......@@ -179,4 +179,4 @@
margin-bottom: 10px;
}
}
</style>
\ No newline at end of file
</style>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!