Browse Source

Merge branch 'v1.9.0-jm-local' of http://192.168.0.115:3000/bill/fuse-code into v1.9.0-jm-local

xzw 2 months ago
parent
commit
e8beccd95e
5 changed files with 1653 additions and 1347 deletions
  1. 1606 1306
      pnpm-lock.yaml
  2. 1 0
      src/env/index.ts
  3. 9 5
      src/layout/show/slide-menu.vue
  4. 5 5
      src/router/config.ts
  5. 32 31
      src/router/constant.ts

File diff suppressed because it is too large
+ 1606 - 1306
pnpm-lock.yaml


+ 1 - 0
src/env/index.ts

@@ -59,6 +59,7 @@ params.single = Boolean(Number(params.single));
 
 export type Params = {
   caseId: number;
+  ga?: string
   baseURL?: string;
   modelId?: string;
   laserRoot: string;

+ 9 - 5
src/layout/show/slide-menu.vue

@@ -20,6 +20,7 @@ import { views, records } from "@/store";
 import { computed } from "vue";
 
 import type { RouteRaw } from "@/router";
+import { params } from "@/env";
 
 export type MenuItem = {
   name: RoutesName;
@@ -31,17 +32,19 @@ defineEmits<{ (e: "changeItem", item: MenuItem): void }>();
 
 const items = computed(() => {
   const items = [
-    // {
-    //   name: RoutesName.fireInfo,
-    //   config: getRouteConfig(RoutesName.fireInfo),
-    //   ...metas[RoutesName.fireInfo],
-    // },
     {
       name: RoutesName.summaryShow,
       config: getRouteConfig(RoutesName.summaryShow),
       ...metas[RoutesName.summaryShow],
     },
   ];
+  if (params.ga === "true") {
+    items.unshift({
+      name: RoutesName.fireInfo,
+      config: getRouteConfig(RoutesName.fireInfo),
+      ...metas[RoutesName.fireInfo],
+    });
+  }
 
   if (views.value.length) {
     items.push({
@@ -121,6 +124,7 @@ const items = computed(() => {
       background: rgba(0, 200, 175, 0.3);
       color: #00c8af;
     }
+
     &:hover {
       color: var(--color-main-hover);
     }

+ 5 - 5
src/router/config.ts

@@ -93,11 +93,11 @@ export const routes = [
         name: RoutesName.security,
         component: () => import('@/views/security/index.vue')
       },
-      // {
-      //   path: paths[RoutesName.fireInfo],
-      //   name: RoutesName.fireInfo,
-      //   component: () => import('@/views/folder/index.vue')
-      // },
+      {
+        path: paths[RoutesName.fireInfo],
+        name: RoutesName.fireInfo,
+        component: () => import('@/views/folder/index.vue')
+      },
       {
         path: paths[RoutesName.viewShow],
         name: RoutesName.viewShow,

+ 32 - 31
src/router/constant.ts

@@ -1,3 +1,4 @@
+import { params } from "@/env";
 import { ui18n } from "@/lang";
 
 export enum RoutesName {
@@ -37,9 +38,8 @@ export enum RoutesName {
   signModel = "signModel",
   error = "error",
 
-
   // 安防
-  security = 'security'
+  security = "security",
 }
 
 export const paths = {
@@ -62,7 +62,7 @@ export const paths = {
   [RoutesName.view]: "view",
 
   [RoutesName.show]: "/show",
-  // [RoutesName.fireInfo]: "fireInfo",
+  [RoutesName.fireInfo]: "fireInfo",
   [RoutesName.summaryShow]: "summary",
   [RoutesName.recordShow]: "record",
   [RoutesName.viewShow]: "view",
@@ -72,71 +72,72 @@ export const paths = {
   [RoutesName.security]: "security",
 };
 
-export const metas = {
+export const metas: any = {
   [RoutesName.merge]: {
     icon: "joint",
-    title: ui18n.t('fuse.join'),
-    sysTitle: ui18n.t('fuse.name'),
+    title: ui18n.t("fuse.join"),
+    sysTitle: ui18n.t("fuse.name"),
   },
-  [RoutesName.proportion]: { full: true, sysTitle: ui18n.t('fuse.name') },
-  [RoutesName.registration]: { full: true, sysTitle: ui18n.t('fuse.name') },
+  [RoutesName.proportion]: { full: true, sysTitle: ui18n.t("fuse.name") },
+  [RoutesName.registration]: { full: true, sysTitle: ui18n.t("fuse.name") },
   [RoutesName.tagging]: {
     icon: "label",
-    title: ui18n.t('tagging.name'),
-    sysTitle: ui18n.t('fuse.name'),
+    title: ui18n.t("tagging.name"),
+    sysTitle: ui18n.t("fuse.name"),
   },
   [RoutesName.guide]: {
     icon: "path",
-    title: ui18n.t('guide.name'),
-    sysTitle: ui18n.t('fuse.name'),
+    title: ui18n.t("guide.name"),
+    sysTitle: ui18n.t("fuse.name"),
   },
   [RoutesName.measure]: {
     icon: "nav-measure",
-    title: ui18n.t('measure.name') ,
-    sysTitle: ui18n.t('fuse.name'),
+    title: ui18n.t("measure.name"),
+    sysTitle: ui18n.t("fuse.name"),
   },
   [RoutesName.setting]: {
     icon: "nav-setup",
-    title: ui18n.t('setting.name'),
-    sysTitle: ui18n.t('fuse.name'),
+    title: ui18n.t("setting.name"),
+    sysTitle: ui18n.t("fuse.name"),
   },
 
   [RoutesName.view]: {
-    sysTitle: ui18n.t('view.name'),
+    sysTitle: ui18n.t("view.name"),
     icon: "nav-setup",
-    title: ui18n.t('view.name'),
-    left: 'scene-list'
+    title: ui18n.t("view.name"),
+    left: "scene-list",
   },
-  [RoutesName.record]: { sysTitle: ui18n.t('record.name') },
+  [RoutesName.record]: { sysTitle: ui18n.t("record.name") },
   [RoutesName.show]: { sysTitle: "" },
 
   [RoutesName.summaryShow]: {
     icon: "list_s",
-    title: ui18n.t('scene.list'),
+    title: ui18n.t("scene.list"),
   },
   [RoutesName.viewShow]: {
     icon: "list-scene",
-    title: ui18n.t('view.vName'),
+    title: ui18n.t("view.vName"),
   },
-  // [RoutesName.fireInfo]: {
-  //   icon: "message_c",
-  //   title:ui18n.t('case.name'),
-  // },
   [RoutesName.recordShow]: {
     icon: "list-record",
-    title: ui18n.t('record.vName'),
+    title: ui18n.t("record.vName"),
   },
   [RoutesName.folderShow]: {
     icon: "list-file",
-    title: ui18n.t('floder.name')
-    
+    title: ui18n.t("floder.name"),
   },
   [RoutesName.error]: {
-    title: ui18n.t('sys.errPage'),
+    title: ui18n.t("sys.errPage"),
   },
   [RoutesName.security]: {
     icon: "path",
-    title: ui18n.t('security.name'),
+    title: ui18n.t("security.name"),
   },
 };
+if (params.ga === 'true') {
+  (metas as any)[RoutesName.fireInfo] = {
+    icon: "message_c",
+    title: ui18n.t("case.name"),
+  };
+}
 export const ViewHome = RoutesName.merge;