Skip to content

罗鑫霖 / vion-tools

Go to a project
Commit fa967f04 by 陈岩
Options

feat: tool聚类、抓拍增加懒加载

1 parent c6c1d344
Inline Side-by-side
Showing 7 changed files with 135 additions and 90 deletions
package-lock.json
This diff could not be displayed because it is too large.
package.json
......@@ -21,6 +21,7 @@
"moment": "^2.29.1",
"vue": "^3.2.27",
"vue-router": "^4.0.8",
"vue-virtual-scroller": "^2.0.0-beta.8",
"vue3-image-preview": "^0.2.7",
"vuex": "^4.0.0"
},
......
public/config.js
window._serverHost = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'https://wenan-poc.efivestar.com/' : window.location.host
window._baseUrl = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'https://wenan-poc.efivestar.com/tool/' : `${window.location.origin}/btool/`
window._reportUrl = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'https://wenan-poc.efivestar.com/report/' : `${window.location.origin}/report/`
window._baseImgUrl = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'https://wenan-poc.efivestar.com/images/' : `${window.location.origin}/images/`
window._serverHost = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'https://store.keliuyun.com/' : window.location.host
window._baseUrl = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'https://store.keliuyun.com/tool/' : `${window.location.origin}/btool/`
window._reportUrl = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'https://store.keliuyun.com/report/' : `${window.location.origin}/report/`
window._baseImgUrl = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'https://store.keliuyun.com/images/' : `${window.location.origin}/images/`
window._matchHost = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? 'http://192.168.1.64:6689/' : window.location.host
window._socketUrl = ['localhost', '192.168.1.120'].includes(window.location.hostname) ? `wss://${window._serverHost}/btool/` : `wss://${window._serverHost}/btool/`
const log = console.log.bind(console)
\ No newline at end of file
const log = console.log.bind(console)
src/views/SnapshotCluster/ClusterResult/ClusterResult.vue
......@@ -62,7 +62,7 @@
<a-select-option :value="1">进</a-select-option>
<a-select-option :value="-1">出</a-select-option>
<a-select-option :value="0">横穿</a-select-option>
<a-select-option :value="2">过店</a-select-option>
<a-select-option :value="2">过店</a-select-option>
<a-select-option :value="4">从左到右</a-select-option>
<a-select-option :value="5">从右到左</a-select-option>
<a-select-option :value="7">关注</a-select-option>
......@@ -234,8 +234,22 @@
<div v-loading="isLoading">
<div class="resultContent" :style="{'height':contentHeight+'px'}">
<template v-for="person in dataList">
<div class="classBox" :class="person.expand?'expand':''">
<DynamicScroller
class="scroller-container"
:items="dataList"
:min-item-size="570"
key-field="person_unid"
ref="dynamicScrollerRef"
>
<template #default="{ item: person, index, active }">
<DynamicScrollerItem
:item="person"
:active="active"
:size-dependencies="[person.expand]"
:data-index="index"
:key="person.person_unid"
>
<div class="classBox" :class="person.expand?'expand':''">
<div :class="person.checked?'checked':''">
<div class="boxInfo">
<span class="iconExpand" v-show="!person.expand">▶</span>
......@@ -275,14 +289,14 @@
特征
</span>
</div>
<el-image v-if="person.imageDisplayType" :src="item.eventPic" :fit="'fill'" class="single-image">
<el-image v-if="person.imageDisplayType" :src="item.eventPic" :fit="'fill'" class="single-image" lazy :scroll-container="dynamicScrollerRef?.$el">
<template #error>
<div class="image-slot">
{{dataSources==1?'去加载':'加载失败'}}
</div>
</template>
</el-image>
<el-image v-else :src="item.picture_url" :fit="'fill'" class="single-image">
<el-image v-else :src="item.picture_url" :fit="'fill'" class="single-image" lazy :scroll-container="dynamicScrollerRef?.$el">
<template #error>
<div class="image-slot">
{{dataSources==1?'去加载':'加载失败'}}
......@@ -302,8 +316,10 @@
</el-col>
</el-row>
</div>
</div>
</template>
</div>
</DynamicScrollerItem>
</template>
</DynamicScroller>
</div>
<a-pagination
v-model:current="pageNum"
......@@ -361,6 +377,8 @@ import SnapShotRecordSearchDialog from "./components/SnapShotRecordSearchDialog.
import AddEditSnapshotClusterDialog from './components/AddEditSnapshotClusterDialog.vue'
import snapshotRecordApi from "@/views/SnapshotCluster/SnapshotRecord/SnapshotRecordApi";
import { DynamicScroller, DynamicScrollerItem } from 'vue-virtual-scroller'
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
export default {
components:{
......@@ -377,6 +395,8 @@ export default {
DetailDialogComparison,
singleImgComparisonDialog,
SnapShotRecordSearchDialog,
DynamicScroller,
DynamicScrollerItem,
......@@ -451,6 +471,7 @@ export default {
const zoneList = ref([])
const positionList = ref([])
const gateList = ref([])
const dynamicScrollerRef = ref(null)
// const imgModelRef = ref();
const pagedTableDataList = computed(
() => {
......@@ -1498,6 +1519,7 @@ export default {
return {
addEditSnapshotClusterRef,
handleAddSnapshotCluster,
dynamicScrollerRef,
// scalar
dataSources,
isLoading,
......@@ -1586,8 +1608,19 @@ export default {
}
</script>
<style lang="less" scoped>
@import "./ClusterResult";
.scroller-container {
height: 500px; /* Adjust as needed */
overflow-y: auto;
}
.classBox {
/* Ensure classBox takes full width within scroller */
width: 100%;
}
.actived{
border: 3px solid #1890ff;
}
......
src/views/SnapshotCluster/SnapshotRecord/SnapshotRecord.vue
......@@ -163,83 +163,89 @@
<div v-loading="isLoading">
<div class="resultContent" :style="{'height':contentHeight+'px'}">
<el-row v-for="row in pagedTableDataList">
<el-col :span="3" v-for="item in row">
<div style="margin: 0 5px;cursor: pointer;" @click="handleClick(item)" :class="currentItemId==item.id?'actived':''">
<div style="">
<RecycleScroller
class="scroller"
:items="dataList"
:item-size="itemHeight"
:grid-items="8"
:item-secondary-size="itemWidth"
key-field="unid"
v-slot="{ item }"
>
<div style="margin: 0 5px;cursor: pointer;" @click="handleClick(item)" :class="currentItemId==item.id?'actived':''">
<div style="">
<span @click="downloadTrajectoryFile(item.track_url)"
class="downBtn">
轨迹
</span>
<span @click="downloadFile(item.features_url)"
class="downBtn downBtn1">
<span @click="downloadFile(item.features_url)"
class="downBtn downBtn1">
特征
</span>
<a-popconfirm
title="删除后无法恢复，确认删除吗？"
ok-text="是"
cancel-text="否"
@confirm="handleDeleteFileConfirm(item)"
>
<a-popconfirm
title="删除后无法恢复，确认删除吗？"
ok-text="是"
cancel-text="否"
@confirm="handleDeleteFileConfirm(item)"
>
<span
style="margin-right: 10px"
class="downBtn downBtn1"
@click="handleDeleteFile(item, $event)"
>删除</span>
</a-popconfirm>
</div>
<el-image :src="item.picture_url" :fit="'fill'" class="single-image" :style="{'height':imgHeight+'px'}">
<template #error>
<div class="image-slot">
{{dataSources==1?'去加载':'加载失败'}}
</div>
</a-popconfirm>
</div>
<el-image :src="item.picture_url" :fit="'fill'" class="single-image" :style="{'height':imgHeight+'px'}" lazy>
<template #error>
<div class="image-slot">
{{dataSources==1?'去加载':'加载失败'}}
</div>
</template>
</el-image>
<div @click="personUnidClick(item.person_unid)">人id: {{ item.person_unid }}</div>
<div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ personTypeStr(item.person_type)}}({{ formatChildAdult(item.childAdult) }})</div>
<div>
<span>性别:{{ formatGender(item.gender) }}({{item.age}})</span>
<a-popover v-if="item.personLabel" trigger="click">
<template #content>
<div class="person-tag-one" v-if="item.personLabel.hairStyle!==null&&item.personLabel.hairStyle!==undefined"><span>发型：</span><span>{{hairStyleStr(item.personLabel.hairStyle)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hairColor!==null&&item.personLabel.hairColor!==undefined"><span>发色：</span><span>{{jacketColorStr(item.personLabel.hairColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hat!==null&&item.personLabel.hat!==undefined"><span>帽子：</span><span>{{hatStr(item.personLabel.hat)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hatColor!==null&&item.personLabel.hatColor!==undefined"><span>帽子颜色：</span><span>{{jacketColorStr(item.personLabel.hatColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.glasses!==null&&item.personLabel.glasses!==undefined"><span>眼镜：</span><span>{{glassesStr(item.personLabel.glasses)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.mask!==null&&item.personLabel.mask!==undefined"><span>口罩：</span><span>{{maskStr(item.personLabel.mask)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.earring!==null&&item.personLabel.earring!==undefined"><span>耳饰：</span><span>{{earringStr(item.personLabel.earring)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.jacketType!==null&&item.personLabel.jacketType!==undefined"><span>上装种类：</span><span>{{jacketTypeStr(item.personLabel.jacketType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.jacketColor!==null&&item.personLabel.jacketColor!==undefined"><span>上装颜色：</span><span>{{jacketColorStr(item.personLabel.jacketColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bottomsType!==null&&item.personLabel.bottomsType!==undefined"><span>下装种类：</span><span>{{bottomsTypeStr(item.personLabel.bottomsType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bottomsColor!==null&&item.personLabel.bottomsColor!==undefined"><span>下装颜色：</span><span>{{jacketColorStr(item.personLabel.bottomsColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.suitType!==null&&item.personLabel.suitType!==undefined"><span>套装种类：</span><span>{{suitTypeStr(item.personLabel.suitType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.suitColor!==null&&item.personLabel.suitColor!==undefined"><span>套装颜色：</span><span>{{jacketColorStr(item.personLabel.suitColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.clothingBrand!==null&&item.personLabel.clothingBrand!==undefined"><span>文字与LOGO：</span><span>{{clothingBrandStr(item.personLabel.clothingBrand)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.necklace!==null&&item.personLabel.necklace!==undefined"><span>佩戴项链：</span><span>{{necklaceStr(item.personLabel.necklace)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.watch!==null&&item.personLabel.watch!==undefined"><span>佩戴手表：</span><span>{{watchStr(item.personLabel.watch)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bracelet!==null&&item.personLabel.bracelet!==undefined"><span>佩戴手链：</span><span>{{braceletStr(item.personLabel.bracelet)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.phone!==null&&item.personLabel.phone!==undefined"><span>手持手机：</span><span>{{phoneStr(item.personLabel.phone)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoeType!==null&&item.personLabel.shoeType!==undefined"><span>鞋子类型：</span><span>{{shoeTypeStr(item.personLabel.shoeType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoeColor!==null&&item.personLabel.shoeColor!==undefined"><span>鞋子颜色：</span><span>{{jacketColorStr(item.personLabel.shoeColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.rucksackType!==null&&item.personLabel.rucksackType!==undefined"><span>背包类型：</span><span>{{rucksackTypeStr(item.personLabel.rucksackType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.rucksackColor!==null&&item.personLabel.rucksackColor!==undefined"><span>背包颜色：</span><span>{{jacketColorStr(item.personLabel.rucksackColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.handbagType!==null&&item.personLabel.handbagType!==undefined"><span>拎包类型：</span><span>{{handbagTypeStr(item.personLabel.handbagType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.handbagColor!==null&&item.personLabel.handbagColor!==undefined"><span>拎包颜色：</span><span>{{jacketColorStr(item.personLabel.handbagColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoppingBagType!==null&&item.personLabel.shoppingBagType!==undefined"><span>提袋类型：</span><span>{{shoppingBagTypeStr(item.personLabel.shoppingBagType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoppingBagColor!==null&&item.personLabel.shoppingBagColor!==undefined"><span>提袋颜色：</span><span>{{jacketColorStr(item.personLabel.shoppingBagColor)}}</span></div>
</template>
</el-image>
<div @click="personUnidClick(item.person_unid)">人id: {{ item.person_unid }}</div>
<div>时间:{{ item.counttime }}</div>
<div>人员类型:{{ personTypeStr(item.person_type)}}({{ formatChildAdult(item.childAdult) }})</div>
<div>
<span>性别:{{ formatGender(item.gender) }}({{item.age}})</span>
<a-popover v-if="item.personLabel" trigger="click">
<template #content>
<div class="person-tag-one" v-if="item.personLabel.hairStyle!==null&&item.personLabel.hairStyle!==undefined"><span>发型：</span><span>{{hairStyleStr(item.personLabel.hairStyle)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hairColor!==null&&item.personLabel.hairColor!==undefined"><span>发色：</span><span>{{jacketColorStr(item.personLabel.hairColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hat!==null&&item.personLabel.hat!==undefined"><span>帽子：</span><span>{{hatStr(item.personLabel.hat)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.hatColor!==null&&item.personLabel.hatColor!==undefined"><span>帽子颜色：</span><span>{{jacketColorStr(item.personLabel.hatColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.glasses!==null&&item.personLabel.glasses!==undefined"><span>眼镜：</span><span>{{glassesStr(item.personLabel.glasses)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.mask!==null&&item.personLabel.mask!==undefined"><span>口罩：</span><span>{{maskStr(item.personLabel.mask)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.earring!==null&&item.personLabel.earring!==undefined"><span>耳饰：</span><span>{{earringStr(item.personLabel.earring)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.jacketType!==null&&item.personLabel.jacketType!==undefined"><span>上装种类：</span><span>{{jacketTypeStr(item.personLabel.jacketType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.jacketColor!==null&&item.personLabel.jacketColor!==undefined"><span>上装颜色：</span><span>{{jacketColorStr(item.personLabel.jacketColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bottomsType!==null&&item.personLabel.bottomsType!==undefined"><span>下装种类：</span><span>{{bottomsTypeStr(item.personLabel.bottomsType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bottomsColor!==null&&item.personLabel.bottomsColor!==undefined"><span>下装颜色：</span><span>{{jacketColorStr(item.personLabel.bottomsColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.suitType!==null&&item.personLabel.suitType!==undefined"><span>套装种类：</span><span>{{suitTypeStr(item.personLabel.suitType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.suitColor!==null&&item.personLabel.suitColor!==undefined"><span>套装颜色：</span><span>{{jacketColorStr(item.personLabel.suitColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.clothingBrand!==null&&item.personLabel.clothingBrand!==undefined"><span>文字与LOGO：</span><span>{{clothingBrandStr(item.personLabel.clothingBrand)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.necklace!==null&&item.personLabel.necklace!==undefined"><span>佩戴项链：</span><span>{{necklaceStr(item.personLabel.necklace)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.watch!==null&&item.personLabel.watch!==undefined"><span>佩戴手表：</span><span>{{watchStr(item.personLabel.watch)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.bracelet!==null&&item.personLabel.bracelet!==undefined"><span>佩戴手链：</span><span>{{braceletStr(item.personLabel.bracelet)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.phone!==null&&item.personLabel.phone!==undefined"><span>手持手机：</span><span>{{phoneStr(item.personLabel.phone)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoeType!==null&&item.personLabel.shoeType!==undefined"><span>鞋子类型：</span><span>{{shoeTypeStr(item.personLabel.shoeType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoeColor!==null&&item.personLabel.shoeColor!==undefined"><span>鞋子颜色：</span><span>{{jacketColorStr(item.personLabel.shoeColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.rucksackType!==null&&item.personLabel.rucksackType!==undefined"><span>背包类型：</span><span>{{rucksackTypeStr(item.personLabel.rucksackType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.rucksackColor!==null&&item.personLabel.rucksackColor!==undefined"><span>背包颜色：</span><span>{{jacketColorStr(item.personLabel.rucksackColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.handbagType!==null&&item.personLabel.handbagType!==undefined"><span>拎包类型：</span><span>{{handbagTypeStr(item.personLabel.handbagType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.handbagColor!==null&&item.personLabel.handbagColor!==undefined"><span>拎包颜色：</span><span>{{jacketColorStr(item.personLabel.handbagColor)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoppingBagType!==null&&item.personLabel.shoppingBagType!==undefined"><span>提袋类型：</span><span>{{shoppingBagTypeStr(item.personLabel.shoppingBagType)}}</span></div>
<div class="person-tag-one" v-if="item.personLabel.shoppingBagColor!==null&&item.personLabel.shoppingBagColor!==undefined"><span>提袋颜色：</span><span>{{jacketColorStr(item.personLabel.shoppingBagColor)}}</span></div>
</template>
<span style="margin-right: 10px;" class="downBtn downBtn1">标签</span>
</a-popover>
</div>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div>
<div style="width:100%;overflow:hidden;text-overflow:ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;">商品类型:{{ formatProduct(item.productId)}}</div>
<div style="width:100%;overflow:hidden;text-overflow:ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;">机位号:{{ formatPosition(item.channelProductId)}}</div>
<div>持续时间:{{ item.duration!==null&&item.duration!==undefined&&item.duration>=0?item.duration+'秒':'--' }}</div>
<span style="margin-right: 10px;" class="downBtn downBtn1">标签</span>
</a-popover>
</div>
</el-col>
</el-row>
<div class="direction" :class="'direction'+item.direction">方向:{{ formatDirection(item.direction) }}</div>
<div>地点:{{ item.gate_name }}</div>
<div style="width:100%;overflow:hidden;text-overflow:ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;">商品类型:{{ formatProduct(item.productId)}}</div>
<div style="width:100%;overflow:hidden;text-overflow:ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;">机位号:{{ formatPosition(item.channelProductId)}}</div>
<div>持续时间:{{ item.duration!==null&&item.duration!==undefined&&item.duration>=0?item.duration+'秒':'--' }}</div>
</div>
</RecycleScroller>
</div>
<a-pagination
v-model:current="pageNum"
......@@ -261,12 +267,13 @@
</template>
<script>
import {computed, reactive, ref, toRaw} from 'vue'
import { reactive, ref, toRaw} from 'vue'
import { RecycleScroller } from 'vue-virtual-scroller'
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
import snapshotRecordApi from '@/views/SnapshotCluster/SnapshotRecord/SnapshotRecordApi'
import {isArray} from '@/PublicUtil/Judgment'
import moment from 'moment'
import { flattenDeep } from 'lodash'
import {filterEmptyValueInObject, formatDate, formatTime, getPagedList} from '@/PublicUtil/PublicUtil'
import { filterEmptyValueInObject, formatDate} from '@/PublicUtil/PublicUtil'
// import imgDialog from '../imgDialog.vue'
import {ElMessage} from 'element-plus'
import DetailDialog from "../../ComparisonCapturedPictures/DetailDialog.vue";
......@@ -275,9 +282,10 @@ import singleImgComparisonDialog from "../singleImgComparisonDialog.vue";
export default {
components:{
// imgDialog ,
DetailDialog,
DetailDialog,
batchesResultDialog,
singleImgComparisonDialog
singleImgComparisonDialog,
RecycleScroller
},
setup() {
// scalar
......@@ -301,11 +309,6 @@ export default {
// ref
const DetailDialogRef = ref();
const batchesResultDialogRef = ref();
const pagedTableDataList = computed(
() => {
return getPagedList(dataList.value, 8)
}
)
const queryForm = reactive(
{
......@@ -656,7 +659,9 @@ export default {
}
// 点击人id，将人id复制到剪切板
const personUnidClick = function(val){
// return (personTypeList.value.filter(v => v.value == val)[0] || {label:'--'}).label
navigator.clipboard.writeText(val).then(() => {
ElMessage.success('人员ID已复制到剪贴板')
})
}
const formatProduct = function(val) {
if(val < 0){
......@@ -1503,10 +1508,14 @@ export default {
}
const contentHeight = ref(0)
const imgHeight = ref(0)
const itemWidth = ref(0)
const itemHeight = ref(0)
const __main = function() {
getAccountList()
contentHeight.value = window.innerHeight - 320
imgHeight.value = (((window.innerWidth - 240)/8)-10)*1.21
itemWidth.value = (window.innerWidth - 240)/8
itemHeight.value = imgHeight.value + 280
}
__main()
......@@ -1519,7 +1528,7 @@ export default {
* 3.刷新列表页面
*/
// console.log('pagedTableDataList', pagedTableDataList)
const allList = flattenDeep(pagedTableDataList.value)
const allList = dataList.value
const paramsUnid = []
allList.forEach(item => {
if (!item.picture_url) {
......@@ -1549,10 +1558,12 @@ export default {
zoneList,
positionList,
gateList,
pagedTableDataList,
dataList,
currentItemId,
contentHeight,
imgHeight,
itemWidth,
itemHeight,
// mapping
queryForm,
// function
......
vue.config.js
......@@ -70,7 +70,7 @@ module.exports = {
}
},
'/': {
target: 'https://wenan-poc.efivestar.com/btool/',
target: 'https://store.keliuyun.com/btool/',
// target: 'http://117.133.143.116:33333/btool/',
changeOrigin: true
},
......
yarn.lock 0 → 100644
This diff could not be displayed because it is too large.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!