fix(服务强军兴军): 路由轨迹记录待优化

.env

 VITE_DEV_API="/mock"
 VITE_PRD_API="/mock"
+
+VITE_SYSTEM_NAMR="创新示范绩效评价"
\ No newline at end of file

package-lock.json

@@ -2300,8 +2300,8 @@
     },
     "lodash": {
       "version": "4.17.21",
-      "resolved": "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1618847150612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash%2Fdownload%2Flodash-4.17.21.tgz",
-      "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.clonedeep": {
       "version": "4.5.0",

package.json

@@ -15,6 +15,7 @@
     "echarts": "^5.2.1",
     "element-plus": "^1.1.0-beta.19",
     "install": "^0.13.0",
+    "lodash": "^4.17.21",
     "node-sass": "^6.0.1",
     "npm": "^8.1.0",
     "path": "^0.12.7",

public/mocks/app/navList.json

@@ -7,37 +7,37 @@
         },
         {
             "icon": "",
-            "link": "/evaluatIndicator",
+            "link": "/dataCenter",
             "name": "评价指标",
             "children": [
                 {
                     "icon": "",
-                    "link": "/evaluatIndicator",
+                    "link": "/dataCenter",
                     "name": "首页"
                 },
                 {
                     "icon": "",
-                    "link": "/evaluatIndicator/army",
+                    "link": "/dataCenter/army",
                     "name": "服务强军兴军"
                 },
                 {
                     "icon": "",
-                    "link": "/evaluatIndicator/industrial",
+                    "link": "/dataCenter/industrial",
                     "name": "产业融合发展"
                 },
                 {
                     "icon": "",
-                    "link": "/evaluatIndicator",
+                    "link": "/dataCenter",
                     "name": "军民协同创新"
                 },
                 {
                     "icon": "",
-                    "link": "/evaluatIndicator",
+                    "link": "/dataCenter",
                     "name": "资源开放共享"
                 },
                 {
                     "icon": "",
-                    "link": "/evaluatIndicator",
+                    "link": "/dataCenter",
                     "name": "五大体系建设"
                 }
             ]

src/layout/head.vue

@@ -41,7 +41,7 @@
       </el-row>
 
       <!-- 行动轨迹记录 -->
-      <div class="proceed-record">
+      <div v-if="curRouteHistoy.length > 0" class="proceed-record">
         <el-row align="middle">
           <el-icon><ArrowLeftBold /></el-icon>
           返回
@@ -50,20 +50,20 @@
 
         <el-row>
           <div
-            v-for="(item, index) in proceedActiveList"
+            v-for="(item, index) in curRouteHistoy"
             :key="item"
             class="proceed-item"
             :class="{
-              'lignht-color': index === proceedActiveList.length - 1,
+              'lignht-color': index === curRouteHistoy.length - 1,
             }"
             @click="toPage(item)"
           >
             <el-icon
               v-if="index > 0"
-              :color="index === proceedActiveList.length - 1 ? '#409EFC' : ''"
+              :color="index === curRouteHistoy.length - 1 ? '#409EFC' : ''"
               ><CaretRight
             /></el-icon>
-            {{ item.name }}
+            {{ item.label }}
           </div>
         </el-row>
       </div>
@@ -74,6 +74,9 @@
 import { defineComponent } from "vue";
 import { getNavList } from "./service";
 import { ArrowLeftBold, CaretRight } from "@element-plus/icons";
+import { routes } from "@/route";
+
+const ENV_PARAMS = import.meta.env; // 这是Vite官方指导获取环境变量的方式
 
 export default defineComponent({
   components: {
@@ -86,18 +89,10 @@ export default defineComponent({
       secodndList: [],
       activeIndex: 0,
       secondIndex: 0,
-      proceedActiveList: [
-        {
-          name: "创新示范绩效评价",
-          path: "/",
-        },
-        {
-          name: "数据中心",
-          path: "/",
-        },
-      ],
+      curRouteHistoy: [],
     };
   },
+  created() {},
   async mounted() {
     const { data: navList } = await getNavList();
     this.navList = navList || [];
@@ -107,53 +102,45 @@ export default defineComponent({
   },
   watch: {
     $route() {
-      const { name } = this.$route;
-      if (name === "EvaluatIndicator") {
-        this.proceedActiveList = [
-          {
-            name: "创新示范绩效评价",
-            path: "/",
-          },
-          {
-            name: "数据中心",
-            path: "/",
-          },
-        ];
-      } else {
-        this.proceedActiveList = [
-          {
-            name: "创新示范绩效评价",
-            path: "/",
-          },
+      const { meta, path } = this.$route;
+      const { VITE_SYSTEM_NAMR = "创新示范绩效评价" } = ENV_PARAMS;
+      const routHistroy = [];
+      meta.person &&
+        routHistroy.push({
+          path: meta.person.path,
+          label: meta.person.label,
+        });
+
+      this.curRouteHistoy = [
         {
-            name: "数据中心",
           path: "/",
+          label: VITE_SYSTEM_NAMR,
         },
+        ...routHistroy,
         {
-            name: "产品融合发展",
-            path: "/evaluatIndicator/industrial",
+          path,
+          label: meta.label,
         },
       ];
-      }
     },
   },
   methods: {
     navClick(item: {}, index: number) {
-      const { link, children = [] } = item;
-      this.activeIndex = index;
-      this.secondIndex = 0;
-      this.secodndList = children;
-
-      this.$router.push(link);
+      // const { link, children = [] } = item;
+      // this.activeIndex = index;
+      // this.secondIndex = 0;
+      // this.secodndList = children;
+      // this.$router.push(link);
     },
 
     secondHandle(item: {}, index: number) {
-      this.secondIndex = index;
-      this.$router.push(item.link);
+      // this.secondIndex = index;
+      // this.$router.push(item.link);
     },
     toPage(item) {
-      this.$router.push(item.path)
-    }
+      console.log("item-", item);
+      this.$router.push(item.path);
+    },
   },
 });
 </script>

src/route/dataCenter.ts

+/**
+ * 数据中心模块——路由
+ */
+export enum DataCenterRouter {
+    DATA_CENTER = "/dataCenter",
+    DATA_MAP = "/dataCenter/map",
+    DATA_INDUSTRIAL = "/dataCenter/industrial",
+    DATA_ARMY = "/dataCenter/army",
+}
+
+
+export default [
+    {
+        path: DataCenterRouter.DATA_CENTER,
+        name: "DataCenter",
+        component: () => import("@/views/dataCenter/index.vue"),
+        redirect: DataCenterRouter.DATA_MAP,
+        children: [
+            {
+                path: DataCenterRouter.DATA_MAP,
+                meta: {
+                    label: "数据中心",
+                },
+                name: "Map",
+                component: () => import("@/views/dataCenter/map/index.vue")
+            },
+            {
+                path: DataCenterRouter.DATA_INDUSTRIAL,
+                name: "Industrial",
+                meta: {
+                    person: {
+                        path: DataCenterRouter.DATA_CENTER,
+                        name: "DataCenter",
+                        label: "数据中心",
+                    },
+                    label: "产业融合发展",
+                },
+                component: () => import("@/views/dataCenter/industrial/index.vue")
+            },
+            {
+                path: DataCenterRouter.DATA_ARMY,
+                name: "Army",
+                meta: {
+                    person: {
+                        path: DataCenterRouter.DATA_CENTER,
+                        name: "DataCenter",
+                        label: "数据中心",
+                    },
+                    label: "服务强军兴军",
+                },
+                component: () => import("@/views/dataCenter/army/index.vue")
+            }
+        ],
+
+    },
+
+]
\ No newline at end of file

src/route/evaluatIndicator.ts

-/**
- * 评价体系模块——路由
- */
-export enum EvaluatIndicatorRouter {
-    EVALUAT_INDICATOR = "/evaluatIndicator",
-    INDUSTRIAL = "/evaluatIndicator/industrial",
-    ARMY = "/evaluatIndicator/army",
-}
-
-
-export default [
-    
-    {
-        path: EvaluatIndicatorRouter.EVALUAT_INDICATOR,
-        name: "EvaluatIndicator",
-        component: () => import("@/views/evaluatIndicator/index/index.vue")
-    },
-    {
-        path: EvaluatIndicatorRouter.INDUSTRIAL,
-        name: "Industrial",
-        component: () => import("@/views/evaluatIndicator/industrial/index.vue")
-    },
-    {
-        path: EvaluatIndicatorRouter.ARMY,
-        name: "Army",
-        component: () => import("@/views/evaluatIndicator/army/index.vue")
-    },
-    {
-        path: "/:pathMatch(.*)*",
-        redirect: "/evaluatIndicator",
-    },
-]
\ No newline at end of file

src/route/index.ts

 import { createRouter, createWebHistory, createWebHashHistory } from "vue-router"
-import evaluatIndicator from "./evaluatIndicator"
-
-
+import dataCenter from "./dataCenter"
 import navigation from "./navigation";
+import {
+    DataCenterRouter
+} from "./dataCenter"
 
-const routes: any[] = [
-    ...evaluatIndicator
+export const routes: any[] = [
+    ...dataCenter,
+    {
+        path: "/:pathMatch(.*)*",
+        redirect: DataCenterRouter.DATA_MAP,
+    },
 ]
 
 const router = createRouter({

src/route/navigation.tsx

@@ -2,11 +2,12 @@ import {Router} from "vue-router"
 export default (router: Router) => {
     const token = localStorage.getItem("token")
     // router.beforeEach((to, from, next) => {
-    //     if(!token) {
-    //         to.path === "/login" ? next() : router.replace("/login");
-    //     }else {
+    //     // if(!token) {
+    //     //     to.path === "/login" ? next() : router.replace("/login");
+    //     // }else {
+    //     //     next()
+    //     // }
     //     next()
-    //     }
     // })
     return router
 }
\ No newline at end of file

src/views/dataCenter/index.vue

+<template>
+  <router-view></router-view>
+</template>
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+/**
+ * 数据中心模块
+ */
+export default defineComponent({
+    setup() {
+        
+    },
+})
+</script>

src/views/evaluatIndicator/index/model/CardList/industrial.vue → src/views/dataCenter/map/model/CardList/industrial.vue

@@ -67,7 +67,7 @@
 import { defineComponent } from "vue";
 import MapTitle from "@/components/mapTitle/index.vue";
 import { Aim } from "@element-plus/icons";
-import {EvaluatIndicatorRouter} from "@/route/evaluatIndicator"
+import {DataCenterRouter} from "@/route/dataCenter"
 
 export default defineComponent({
   components: {
@@ -77,7 +77,8 @@ export default defineComponent({
   setup() {},
   methods: {
     detailsHandle() {
-      this.$router.push(EvaluatIndicatorRouter.INDUSTRIAL)
+      console.log("--DataCenterRouter-sssss-", DataCenterRouter)
+      this.$router.push(DataCenterRouter.DATA_INDUSTRIAL)
     },
   },
 });

src/views/evaluatIndicator/index/model/CardList/strongArmy.vue → src/views/dataCenter/map/model/CardList/strongArmy.vue

@@ -95,8 +95,8 @@
 import { defineComponent } from "vue";
 import MapTitle from "@/components/mapTitle/index.vue";
 import {
-  EvaluatIndicatorRouter
-} from "@/route/evaluatIndicator"
+  DataCenterRouter
+} from "@/route/dataCenter"
 
 export default defineComponent({
   components: {
@@ -105,7 +105,7 @@ export default defineComponent({
   setup() {},
   methods: {
     detailsHandle() {
-      this.$router.push(EvaluatIndicatorRouter.ARMY);
+      this.$router.push(DataCenterRouter.DATA_ARMY);
     },
   },
 });

src/views/evaluatIndicator/index/model/service.ts → src/views/dataCenter/map/model/service.ts

@@ -4,13 +4,13 @@ import request from "../../../../axios/index"
 // 获取地图数据JOSN格式
 export async function getMapGeoData() {
   return request({
-    url: '../../../../../public/mocks/evaluatIndicator/mapGeoData.json',
+    url: '../../../../../public/mocks/dataCenter/mapGeoData.json',
   })
 }
 
 // 获取地图标记点
 export async function getMapPointList() {
   return request({
-    url: '../../../../../public/mocks/evaluatIndicator/mapPointList.json',
+    url: '../../../../../public/mocks/dataCenter/mapPointList.json',
   })
 }