|
@@ -124,8 +124,8 @@ const handleTableChange: TableProps["onChange"] = (pag) => {
|
|
|
params.value.pageSize = pag.pageSize!;
|
|
|
params.value.pageNum = pag.current!;
|
|
|
};
|
|
|
-const meshParams = ref({ isObj: 1, pageNum: 1, pageSize: 12, total: 0 })
|
|
|
-const cloudParams = ref({ isObj: 0, pageNum: 1, pageSize: 12, total: 0 })
|
|
|
+const meshParams = ref({ isObj: 1, pageNum: 1, pageSize: 12, total: 0, sceneName: '' })
|
|
|
+const cloudParams = ref({ isObj: 0, pageNum: 1, pageSize: 12, total: 0, sceneName: '' })
|
|
|
const meshList = ref<Scene[]>([])
|
|
|
const cloudList = ref<Scene[]>([])
|
|
|
const params = computed(() => type.value === 'Mesh场景' ? meshParams.value : cloudParams.value)
|
|
@@ -134,7 +134,7 @@ let loadCount = 0
|
|
|
watchEffect(() => {
|
|
|
const list = type.value === '点云场景' ? meshList : cloudList
|
|
|
const currentCount = ++loadCount
|
|
|
- fetchScenesAll(params.value).then((data) => {
|
|
|
+ fetchScenesAll({...params.value, sceneName: keyword.value, }).then((data) => {
|
|
|
console.log('====>', currentCount, loadCount, params.value)
|
|
|
if (currentCount === loadCount) {
|
|
|
|
|
@@ -151,7 +151,8 @@ const typeFilterScenes = computed(() => {
|
|
|
const typeScenes: any = {};
|
|
|
for (const type of types.value) {
|
|
|
typeScenes[type] = origin.value
|
|
|
- .filter((item) => item.name && item.num && item.name.includes(keyword.value))
|
|
|
+ // && item.name.includes(keyword.value)
|
|
|
+ .filter((item) => item.name && item.num )
|
|
|
.filter((item) => item.type === type);
|
|
|
}
|
|
|
return typeScenes;
|