Browse Source

修复类型问题

bill 1 year ago
parent
commit
b4f283aa1b
2 changed files with 81 additions and 90 deletions
  1. 1 1
      src/layout/edit/fuse-edit.vue
  2. 80 89
      src/router/constant.ts

+ 1 - 1
src/layout/edit/fuse-edit.vue

@@ -69,7 +69,7 @@ router.beforeEach(async (to, from, next) => {
 })
 watch(router.currentRoute, (_n, _, onClean) => {
   const meta = currentMeta.value
-  if (meta && 'full' in meta && meta.full) {
+  if (meta && 'full' in meta && (meta as any).full) {
     enterEdit(() => {
       if (!history.state.back) {
         router.replace({ name: RoutesName.merge })

+ 80 - 89
src/router/constant.ts

@@ -1,133 +1,124 @@
 export enum RoutesName {
   // 编辑融合页面
-  fuseEdit = 'fuseEdit',
-  
+  fuseEdit = "fuseEdit",
+
   // 独立,配准、设置比例
-  registration = 'registration',
-  proportion = 'proportion',
+  registration = "registration",
+  proportion = "proportion",
 
   // 菜单,独立编辑融合页面
-  fuseEditSwitch = 'fuseEditSwitch',
-  merge = 'merge',
-  tagging = 'tagging',
-  taggingPosition = 'taggingPosition',
-  guide = 'guide',
-  measure = 'measure',
-  setting = 'setting',
-  
-  // 编辑场景,提取视图,录制视频
-  sceneEdit = 'sceneEdit',
-  record = 'record',
-  view = 'view',
-
+  fuseEditSwitch = "fuseEditSwitch",
+  merge = "merge",
+  tagging = "tagging",
+  taggingPosition = "taggingPosition",
+  guide = "guide",
+  measure = "measure",
+  setting = "setting",
 
+  // 编辑场景,提取视图,录制视频
+  sceneEdit = "sceneEdit",
+  record = "record",
+  view = "view",
 
   // 展示界面,包括融合和独立场景
-  show = 'show',
+  show = "show",
   // 汇总
-  summaryShow = 'summaryShow',
-  recordShow = 'recordShow',
-  viewShow = 'viewShow',
-  folderShow = 'folderShow',
+  summaryShow = "summaryShow",
+  recordShow = "recordShow",
+  viewShow = "viewShow",
+  folderShow = "folderShow",
   // 火调信息详情页
-  fireInfo = 'fireInfo',
-
+  fireInfo = "fireInfo",
 
   // 单模型展示
-  signModel = 'signModel',
-  error = "error"
+  signModel = "signModel",
+  error = "error",
 }
 
-
 export const paths = {
-  [RoutesName.error]: '/error',
-  [RoutesName.fuseEdit]: '/fuseEdit',
+  [RoutesName.error]: "/error",
+  [RoutesName.fuseEdit]: "/fuseEdit",
 
-  [RoutesName.fuseEditSwitch]: '',
-  [RoutesName.merge]: 'merge',
-  [RoutesName.registration]: 'registration/:id',
-  [RoutesName.proportion]: 'proportion/:id',
+  [RoutesName.fuseEditSwitch]: "",
+  [RoutesName.merge]: "merge",
+  [RoutesName.registration]: "registration/:id",
+  [RoutesName.proportion]: "proportion/:id",
 
-  [RoutesName.tagging]: 'tagging',
-  [RoutesName.taggingPosition]: 'taggingPosition/:id',
-  [RoutesName.guide]: 'path',
-  [RoutesName.measure]: 'measure',
-  [RoutesName.setting]: 'setting',
-  
-  [RoutesName.sceneEdit]: '/sceneEdit',
-  [RoutesName.record]: 'record',
-  [RoutesName.view]: 'view',
+  [RoutesName.tagging]: "tagging",
+  [RoutesName.taggingPosition]: "taggingPosition/:id",
+  [RoutesName.guide]: "path",
+  [RoutesName.measure]: "measure",
+  [RoutesName.setting]: "setting",
 
-  [RoutesName.show]: '/show',
-  [RoutesName.fireInfo]: 'fireInfo',
-  [RoutesName.summaryShow]: 'summary',
-  [RoutesName.recordShow]: 'record',
-  [RoutesName.viewShow]: 'view',
-  [RoutesName.folderShow]: 'folder',
-  
-  [RoutesName.signModel]: '/sign-model'
-}
+  [RoutesName.sceneEdit]: "/sceneEdit",
+  [RoutesName.record]: "record",
+  [RoutesName.view]: "view",
+
+  [RoutesName.show]: "/show",
+  [RoutesName.fireInfo]: "fireInfo",
+  [RoutesName.summaryShow]: "summary",
+  [RoutesName.recordShow]: "record",
+  [RoutesName.viewShow]: "view",
+  [RoutesName.folderShow]: "folder",
+
+  [RoutesName.signModel]: "/sign-model",
+};
 
 export const metas = {
   [RoutesName.merge]: {
-    icon: 'joint',
-    title: '拼接',
-    sysTitle: '多元融合'
+    icon: "joint",
+    title: "拼接",
+    sysTitle: "多元融合",
   },
-  [RoutesName.proportion]: { full: true,
-    sysTitle: '多元融合' },
-  [RoutesName.registration]: { full: true,
-    sysTitle: '多元融合' },
+  [RoutesName.proportion]: { full: true, sysTitle: "多元融合" },
+  [RoutesName.registration]: { full: true, sysTitle: "多元融合" },
   [RoutesName.tagging]: {
-    icon: 'label',
-    title: '标注',
-    sysTitle: '多元融合'
+    icon: "label",
+    title: "标注",
+    sysTitle: "多元融合",
   },
   [RoutesName.guide]: {
-    icon: 'path',
-    title: '路径',
-    sysTitle: '多元融合'
+    icon: "path",
+    title: "路径",
+    sysTitle: "多元融合",
   },
   [RoutesName.measure]: {
-    icon: 'nav-measure',
-    title: '测量',
-    sysTitle: '多元融合'
+    icon: "nav-measure",
+    title: "测量",
+    sysTitle: "多元融合",
   },
   [RoutesName.setting]: {
-    icon: 'nav-setup',
-    title: '设置',
-    sysTitle: '多元融合'
+    icon: "nav-setup",
+    title: "设置",
+    sysTitle: "多元融合",
   },
 
-  [RoutesName.view]: { sysTitle: '视图提取' },
-  [RoutesName.record]: { sysTitle: '屏幕录制' },
-  [RoutesName.show]: { sysTitle: '' },
-
+  [RoutesName.view]: { sysTitle: "视图提取" },
+  [RoutesName.record]: { sysTitle: "屏幕录制" },
+  [RoutesName.show]: { sysTitle: "" },
 
   [RoutesName.summaryShow]: {
-    icon: 'list-view',
-    title: '汇总'
+    icon: "list-view",
+    title: "汇总",
   },
   [RoutesName.viewShow]: {
-    icon: 'list-scene',
-    title: '视图',
-    
+    icon: "list-scene",
+    title: "视图",
   },
   [RoutesName.fireInfo]: {
-    icon: 'list-detail',
-    title: '案件信息',
-    
+    icon: "list-detail",
+    title: "案件信息",
   },
   [RoutesName.recordShow]: {
-    icon: 'list-record',
-    title: '录屏'
+    icon: "list-record",
+    title: "录屏",
   },
   [RoutesName.folderShow]: {
-    icon: 'list-file',
-    title: '卷宗'
+    icon: "list-file",
+    title: "卷宗",
   },
   [RoutesName.error]: {
-    title: '错误页面'
+    title: "错误页面",
   },
-}
-export const ViewHome = RoutesName.merge
+};
+export const ViewHome = RoutesName.merge;