bill 1 рік тому
батько
коміт
f695baf9f3

+ 2 - 0
src/store/scene.ts

@@ -65,6 +65,7 @@ export enum QuoteSceneStatus {
 
 export interface ModelScene extends BaseScene {
   modelTitle: string;
+  renderType: string;
   modelId: number;
   createStatus: ModelSceneStatus;
   fileNewName: string;
@@ -108,6 +109,7 @@ export const setModelScene = (scene: ModelScene) =>
   axios.post(updateModelScene, {
     modelId: scene.modelId,
     modelTitle: scene.modelTitle,
+    renderType: scene.renderType,
   });
 
 export const cancelUploadModelScene = (scene: ModelScene) =>

+ 10 - 1
src/view/vrmodel/editModel.vue

@@ -7,6 +7,12 @@
         placeholder="请输入模型名称"
       />
     </el-form-item>
+    <el-form-item label="渲染方式">
+      <el-select placeholder="请选择" v-model="bindModel.renderType">
+        <el-option label="基础材质(无光照)" value="base" />
+        <el-option label="标准材质(有光照,适用于无贴图模型)" value="normal" />
+      </el-select>
+    </el-form-item>
   </el-form>
 </template>
 
@@ -17,7 +23,10 @@ import { ElMessage } from "element-plus";
 import { QuiskExpose } from "@/helper/mount";
 
 const props = defineProps<{ model: ModelScene }>();
-const bindModel = ref<ModelScene>({ ...props.model });
+const bindModel = ref<ModelScene>({
+  ...props.model,
+  renderType: props.model.renderType || "base",
+});
 
 defineExpose<QuiskExpose>({
   async submit() {

+ 2 - 11
src/view/vrmodel/modelContent.vue

@@ -62,24 +62,15 @@
         </span>
       </template>
       <span
-        v-else-if="
-          [ModelSceneStatus.SUCCESS, ModelSceneStatus.ERR].includes(row.createStatus)
-        "
+        v-if="row.createStatus !== ModelSceneStatus.REV"
         class="oper-span delBtn"
-        v-pdscene="row"
         @click="delOrCancel(row)"
         v-pdpath="'del'"
       >
         {{ row.createStatus !== ModelSceneStatus.RUN ? "删除" : "取消上传" }}
       </span>
 
-      <span
-        v-else-if="row.createStatus === ModelSceneStatus.REV"
-        class="oper-span"
-        v-pdpath="['viewaaa']"
-      >
-        模型转换中…
-      </span>
+      <span v-else class="oper-span" v-pdpath="['viewaaa']"> 模型转换中… </span>
     </el-table-column>
   </el-table>
 

+ 1 - 5
src/view/vrmodel/sceneContent.vue

@@ -74,12 +74,8 @@
       </span>
 
       <span
-        v-if="
-          ![SceneType.SWSSMX, SceneType.SWYDMX].includes(row.type) &&
-          row.status !== QuoteSceneStatus.RUN
-        "
+        v-if="row.status !== QuoteSceneStatus.RUN"
         class="oper-span delBtn"
-        v-pdscene="row"
         @click="delSceneHandler(row)"
         v-pdpath="'del'"
       >