소스 검색

修改需求

bill 2 년 전
부모
커밋
ececd21e46
7개의 변경된 파일14개의 추가작업 그리고 12개의 파일을 삭제
  1. 0 3
      src/layout/edit/scene-select.vue
  2. 7 2
      src/layout/scene-list/index.vue
  3. 1 1
      src/main.ts
  4. 0 1
      src/router/constant.ts
  5. 1 1
      src/store/scene.ts
  6. 1 1
      src/views/record/shot.vue
  7. 4 3
      src/views/sign-model/index.vue

+ 0 - 3
src/layout/edit/scene-select.vue

@@ -103,16 +103,13 @@ const okHandler = createLoadPack(async () => {
     .map(addFuseModel)
 
   await Promise.all(addPromises)
-  console.log('111')
   await new Promise<void>((resolve) => {
     nextTick(() => {
       const stop = watchEffect(() => {
-        console.log('222')
         if (fuseModelsLoaded.value) {
           nextTick(() => {
             stop()
             resolve()
-            console.log('333')
           })
         }
         

+ 7 - 2
src/layout/scene-list/index.vue

@@ -22,7 +22,12 @@
           </template>
         </ModelList>
       </div>
-      <div class="scene" @click="updateCurrent(item.raw)" v-else>
+      <div 
+        class="scene" 
+        :class="{disabled: item.raw.status !== SceneStatus.SUCCESS}" 
+        @click="updateCurrent(item.raw)" 
+        v-else
+      >
         <p>{{ item.raw.name }}</p>
         <p>{{ SceneTypeDesc[item.raw.type as SceneType] }}</p>
       </div>
@@ -32,7 +37,7 @@
 
 <script lang="ts" setup>
 import { computed, nextTick, ref, watch } from 'vue'
-import { scenes, SceneType, SceneTypeDesc, fuseModels } from '@/store'
+import { scenes, SceneType, SceneTypeDesc, fuseModels, SceneStatus } from '@/store'
 import List from '@/components/list/index.vue'
 import ModelList from '../model-list/index.vue'
 import { fuseModel, getModelTypeDesc } from '@/model'

+ 1 - 1
src/main.ts

@@ -15,7 +15,7 @@ app.mount('#app')
 
 
 watchEffect((onCleanup) => {
-  if (currentLayout.value === RoutesName.show) {
+  if ([RoutesName.show, RoutesName.signModel].includes(currentLayout.value!)) {
     const untokenURLS = params.share 
       ? [
           URL.FUSE_MODEL_LIST,

+ 0 - 1
src/router/constant.ts

@@ -84,7 +84,6 @@ export const metas = {
   [RoutesName.view]: { sysTitle: '视图提取' },
   [RoutesName.record]: { sysTitle: '屏幕录制' },
   [RoutesName.show]: { sysTitle: '' },
-  [RoutesName.signModel]: { sysTitle: '单一模型' },
 
 
   [RoutesName.summaryShow]: {

+ 1 - 1
src/store/scene.ts

@@ -15,4 +15,4 @@ export const initialScenes = fetchStoreItems(
   fetchScenes, 
 )
 
-export { SceneType, SceneTypeDesc } from '@/api'
+export { SceneType, SceneTypeDesc, SceneStatus } from '@/api'

+ 1 - 1
src/views/record/shot.vue

@@ -76,7 +76,7 @@ export default defineComponent({
   setup(props, { emit }) {
     const config: any = {
       uploadUrl: '',
-      resolution: '2k',
+      resolution: '4k',
       debug: false,
     }
   

+ 4 - 3
src/views/sign-model/index.vue

@@ -6,7 +6,7 @@
 import { ref } from 'vue'
 import { loadModel, fuseModel as FModel } from '@/model'
 import { fetchScene } from '@/api'
-import { createFuseModels, fuseModels } from '@/store'
+import { createFuseModels, defTitle, fuseModels, SceneStatus } from '@/store'
 import { params, showModelsMapStack } from '@/env'
 import { Dialog } from 'bill/index'
 import { useViewStack, useActive } from '@/hook';
@@ -16,10 +16,12 @@ const active = useActive()
 let pop: () => void
 const loadSignModel = async () => {
   const scene = await fetchScene(Number(params.modelId))
-  if (!scene) {
+  if (!scene || scene.status === SceneStatus.SUCCESS) {
     return Dialog.alert(`模型不存在!`)
   }
   if (active.value) {
+    defTitle.value = scene.title || scene.modelTitle
+    
     const fuseModel = createFuseModels({
       modelId: scene.modelId,
       show: true,
@@ -36,7 +38,6 @@ const loadSignModel = async () => {
   }
 }
 
-
 useViewStack(() => {
   const bcModels = fuseModels.value
   fuseModels.value = []