diff --git a/src/views/Creative/Material.vue b/src/views/Creative/Material.vue index 8159e512..44cf3054 100644 --- a/src/views/Creative/Material.vue +++ b/src/views/Creative/Material.vue @@ -27,7 +27,7 @@
- 超市 + {{row.title}}
三维环境
@@ -48,7 +48,7 @@ 重命名 - 删除 + 删除 @@ -60,7 +60,7 @@
- + @@ -75,7 +75,7 @@ import Previewer from "./components/Previewer.vue"; import RenameMeterial from "./components/RenameMeterial.vue"; import CreateMaterial from "./components/CreateMaterial.vue"; import { THREE_D_TYPE, THREE_D_TYPE_S } from "./components/CreateMaterial.constant"; -import { getMaterialLibrary } from "./api"; +import { getMaterialLibrary, delMaterialLibrary } from "./api"; const previewerRef = ref(); const renameMeterialRef = ref(); @@ -89,9 +89,6 @@ const rows = ref([]); const loading = ref(true); -const search = () => { - alert(); -} const query = async () => { loading.value = true; @@ -104,11 +101,14 @@ const query = async () => { rows.value = res.data; } -const del = () => { +const del = (row) => { Modal.confirm({ title: "确认删除", content: "删除素材后将不能找回,是否确认删除?", - onOk () { }, + async onOk () { + await delMaterialLibrary(row.id); + await query(); + }, onCancel () { }, }); } diff --git a/src/views/Creative/MyCreation.vue b/src/views/Creative/MyCreation.vue index d755c868..d0679246 100644 --- a/src/views/Creative/MyCreation.vue +++ b/src/views/Creative/MyCreation.vue @@ -56,7 +56,7 @@ 重命名 - 删除 + 删除 @@ -117,7 +117,7 @@ import { computed, onMounted, ref, watch } from "@vue/runtime-core"; import { Modal } from "ant-design-vue"; import RenameCreation from "./components/RenameCreation.vue"; import { currentMock } from "./creation.mock"; -import { getMaterials } from "./api"; +import { getMaterials, delMaterialCenter } from "./api"; import { useRouter } from "vue-router"; const router = useRouter(); @@ -132,15 +132,6 @@ const loading = ref(true); const title = ref(""); -const del = () => { - Modal.confirm({ - title: "确认删除", - content: "删除作品后将不能找回,是否确认删除?", - onOk () { }, - onCancel () { }, - }); -} - const query = async () => { loading.value = true; const res = await getMaterials({ @@ -160,6 +151,18 @@ const edit = (row) => { }) } +const del = (row) => { + Modal.confirm({ + title: "确认删除", + content: "删除作品后将不能找回,是否确认删除?", + async onOk () { + await delMaterialCenter(row.id); + await query(); + }, + onCancel () { }, + }); +} + watch( () => current.value, async () => { diff --git a/src/views/Creative/api.js b/src/views/Creative/api.js index fd9ab511..6a4dd322 100644 --- a/src/views/Creative/api.js +++ b/src/views/Creative/api.js @@ -26,6 +26,13 @@ export function setMaterialCenterTitle(id, data) { }) } +/* 3D场景删除 */ +export function delMaterialCenter(id) { + return request({ + url: `/console/material_center/${id}`, + method: 'DELETE' + }) +} /* 素材库列表 */ export function getMaterialLibrary(params) { @@ -35,3 +42,29 @@ export function getMaterialLibrary(params) { }) } +/* 素材库新增 */ +export function createMaterialLibrary(data) { + return request({ + url: `/console/material_library`, + method: 'POST', + data + }) +} + +/* 素材库重命名 */ +export function setMaterialLibraryTitle(id, data) { + return request({ + url: `/console/material_library/${id}/title`, + method: 'PATCH', + data + }) +} + +/* 素材库删除 */ +export function delMaterialLibrary(id) { + return request({ + url: `/console/material_library/${id}`, + method: 'DELETE' + }) +} + diff --git a/src/views/Creative/components/CreateMaterial.constant.js b/src/views/Creative/components/CreateMaterial.constant.js index 26ad00ec..e5e482d2 100644 --- a/src/views/Creative/components/CreateMaterial.constant.js +++ b/src/views/Creative/components/CreateMaterial.constant.js @@ -6,12 +6,23 @@ export const THREE_D_TYPE = { EXHIBITION_BOOTH: 4, WARE: 5, RING_3D: 6, + EMPTY_3D: 7, + CHARTLET: 8, } export const THREE_D_TYPE_S = [ { type: THREE_D_TYPE.PANORAMA, - name: "3D全景" + name: "3D全景", + data: { + "url": "", + "urlSmall": "", + "urlThumb": "", + "urlDepth": "", + "urlShelfExr": "", + "rotationY": 0, + "multiply": 3 + } }, { type: THREE_D_TYPE.ENV_3D, @@ -33,4 +44,12 @@ export const THREE_D_TYPE_S = [ type: THREE_D_TYPE.RING_3D, name: "3D环物" }, + { + type: THREE_D_TYPE.EMPTY_3D, + name: "空白模型" + }, + { + type: THREE_D_TYPE.CHARTLET, + name: "贴图" + }, ]; diff --git a/src/views/Creative/components/CreateMaterial.vue b/src/views/Creative/components/CreateMaterial.vue index ad844ca3..a9e56df1 100644 --- a/src/views/Creative/components/CreateMaterial.vue +++ b/src/views/Creative/components/CreateMaterial.vue @@ -6,11 +6,11 @@ - + - + @@ -21,7 +21,7 @@ 全景图文件格式、大小:JPEG格式,全景图比例2:1,建议单张分辨率大小在2K及以上,单张全景图最大支持上传120M,建议上传小于10M的全景图效果更佳。

- + - + @@ -63,22 +63,18 @@ import { UploadOutlined, InboxOutlined, MinusCircleFilled } from '@ant-design/ic import { THREE_D_TYPE_S, THREE_D_TYPE } from "./CreateMaterial.constant" const { ref, reactive }=require("@vue/reactivity"); import common from "@/api/common.js"; +import { createMaterialLibrary } from "../api"; const title = ref("") const visible = ref(false); const step = ref(0); -const current = ref(null); -const formData = reactive({ - name: '', +const formData = ref({ + type: 0, + title: '', fileList: [], - - init(){ - this.name = ''; - this.fileList = []; - }, }); const show = (type) => { @@ -86,22 +82,25 @@ const show = (type) => { const obj = THREE_D_TYPE_S.find(x => x.type == type); if(!obj) return; - formData.init(); - current.value = obj; - step.value = 0; title.value = obj.name; + + var target = JSON.parse(JSON.stringify(obj)); + target.title = ""; + target.fileList = []; + formData.value = target; + step.value = 0; visible.value = true; } const onCustomRequest = async (upload) => { const data = await common.cosUpload3D(upload.file); - console.log(data) upload.onSuccess(data); } const ok = async () => { step.value++; if(step.value >= 2) { + await createMaterialLibrary(formData.value); visible.value = false; } } diff --git a/src/views/Creative/components/RenameMeterial.vue b/src/views/Creative/components/RenameMeterial.vue index 5346edc5..62d8449b 100644 --- a/src/views/Creative/components/RenameMeterial.vue +++ b/src/views/Creative/components/RenameMeterial.vue @@ -8,13 +8,13 @@ > - + @@ -22,6 +22,9 @@