sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-09-11 18:08:40 +08:00
parent b58aa4649c 418f65ed1f
commit 2b383b9e96
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/common/upload/index.vue
View File

@ -358,7 +358,7 @@ const filter_node = (value: string, data: any): boolean => {
}; };
const type_data = ref<Tree[]>([]); const type_data = ref<Tree[]>([]);
const all_tree = { const all_tree = {
id: '', id: 'all',
pid: '', pid: '',
name: '全部', name: '全部',
items: [], items: [],
@ -717,17 +717,15 @@ onMounted(() => {
// 监听点击事件 // 监听点击事件
document.addEventListener('click', video_show); document.addEventListener('click', video_show);
nextTick(() => { nextTick(() => {
setTimeout(() => { // 获取分类
// 获取分类 if (common_store.common.attachment_category.length > 0) {
if (common_store.common.attachment_category.length > 0) { type_data_list.value = common_store.common.attachment_category;
type_data_list.value = common_store.common.attachment_category; type_data.value = [all_tree, ...common_store.common.attachment_category];
type_data.value = [all_tree, ...common_store.common.attachment_category]; upload_store.set_category(common_store.common.attachment_category);
upload_store.set_category(common_store.common.attachment_category); upload_store.set_is_upload_api(true);
upload_store.set_is_upload_api(true); } else {
} else { get_tree();
get_tree(); }
}
}, 1000);
}); });
}); });

1
src/components/model-hot-zone/index.vue
View File

@ -50,6 +50,7 @@ const on_load_img = () => {
}; };
// containerRef的宽高 // containerRef的宽高
const w_scale1 = computed(() => { const w_scale1 = computed(() => {
// 此处使用容器高度，因为图片是按照容器高度等比缩放的
return container_ref_h.value / img_width.value; return container_ref_h.value / img_width.value;
}); });
const h_scale1 = computed(() => { const h_scale1 = computed(() => {