Skip to content

C
cxsfjx_project_echarts
提交 bc6a230d authored 作者: Your Name's avatar Your Name
浏览文件
操作

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

上级 b6cf9c10
隐藏空白字符变更
内嵌 并排
正在显示 包含 152 行增加 和 114 行删除
.env
浏览文件 @ bc6a230d
VITE_DEV_API="/mock" VITE_DEV_API="/mock"
VITE_PRD_API="/mock" VITE_PRD_API="/mock"
\ No newline at end of file
VITE_SYSTEM_NAMR="创新示范绩效评价"
\ No newline at end of file
package-lock.json
浏览文件 @ bc6a230d
...@@ -2300,8 +2300,8 @@ ...@@ -2300,8 +2300,8 @@
}, },
"lodash": { "lodash": {
"version": "4.17.21", "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", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw=" "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
}, },
"lodash.clonedeep": { "lodash.clonedeep": {
"version": "4.5.0", "version": "4.5.0",
......
package.json
浏览文件 @ bc6a230d
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"echarts": "^5.2.1", "echarts": "^5.2.1",
"element-plus": "^1.1.0-beta.19", "element-plus": "^1.1.0-beta.19",
"install": "^0.13.0", "install": "^0.13.0",
"lodash": "^4.17.21",
"node-sass": "^6.0.1", "node-sass": "^6.0.1",
"npm": "^8.1.0", "npm": "^8.1.0",
"path": "^0.12.7", "path": "^0.12.7",
......
public/mocks/app/navList.json
浏览文件 @ bc6a230d
...@@ -7,37 +7,37 @@ ...@@ -7,37 +7,37 @@
}, },
{ {
"icon": "", "icon": "",
"link": "/evaluatIndicator", "link": "/dataCenter",
"name": "评价指标", "name": "评价指标",
"children": [ "children": [
{ {
"icon": "", "icon": "",
"link": "/evaluatIndicator", "link": "/dataCenter",
"name": "首页" "name": "首页"
}, },
{ {
"icon": "", "icon": "",
"link": "/evaluatIndicator/army", "link": "/dataCenter/army",
"name": "服务强军兴军" "name": "服务强军兴军"
}, },
{ {
"icon": "", "icon": "",
"link": "/evaluatIndicator/industrial", "link": "/dataCenter/industrial",
"name": "产业融合发展" "name": "产业融合发展"
}, },
{ {
"icon": "", "icon": "",
"link": "/evaluatIndicator", "link": "/dataCenter",
"name": "军民协同创新" "name": "军民协同创新"
}, },
{ {
"icon": "", "icon": "",
"link": "/evaluatIndicator", "link": "/dataCenter",
"name": "资源开放共享" "name": "资源开放共享"
}, },
{ {
"icon": "", "icon": "",
"link": "/evaluatIndicator", "link": "/dataCenter",
"name": "五大体系建设" "name": "五大体系建设"
} }
] ]
......
src/layout/head.vue
浏览文件 @ bc6a230d
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</el-row> </el-row>
<!-- 行动轨迹记录 --> <!-- 行动轨迹记录 -->
<div class="proceed-record"> <div v-if="curRouteHistoy.length > 0" class="proceed-record">
<el-row align="middle"> <el-row align="middle">
<el-icon><ArrowLeftBold /></el-icon> <el-icon><ArrowLeftBold /></el-icon>
返回 返回
...@@ -50,20 +50,20 @@ ...@@ -50,20 +50,20 @@
<el-row> <el-row>
<div <div
v-for="(item, index) in proceedActiveList" v-for="(item, index) in curRouteHistoy"
:key="item" :key="item"
class="proceed-item" class="proceed-item"
:class="{ :class="{
'lignht-color': index === proceedActiveList.length - 1, 'lignht-color': index === curRouteHistoy.length - 1,
}" }"
@click="toPage(item)" @click="toPage(item)"
> >
<el-icon <el-icon
v-if="index > 0" v-if="index > 0"
:color="index === proceedActiveList.length - 1 ? '#409EFC' : ''" :color="index === curRouteHistoy.length - 1 ? '#409EFC' : ''"
><CaretRight ><CaretRight
/></el-icon> /></el-icon>
{{ item.name }} {{ item.label }}
</div> </div>
</el-row> </el-row>
</div> </div>
...@@ -74,6 +74,9 @@ ...@@ -74,6 +74,9 @@
import { defineComponent } from "vue"; import { defineComponent } from "vue";
import { getNavList } from "./service"; import { getNavList } from "./service";
import { ArrowLeftBold, CaretRight } from "@element-plus/icons"; import { ArrowLeftBold, CaretRight } from "@element-plus/icons";
import { routes } from "@/route";
const ENV_PARAMS = import.meta.env; // 这是Vite官方指导获取环境变量的方式
export default defineComponent({ export default defineComponent({
components: { components: {
...@@ -86,18 +89,10 @@ export default defineComponent({ ...@@ -86,18 +89,10 @@ export default defineComponent({
secodndList: [], secodndList: [],
activeIndex: 0, activeIndex: 0,
secondIndex: 0, secondIndex: 0,
proceedActiveList: [ curRouteHistoy: [],
{
name: "创新示范绩效评价",
path: "/",
},
{
name: "数据中心",
path: "/",
},
],
}; };
}, },
created() {},
async mounted() { async mounted() {
const { data: navList } = await getNavList(); const { data: navList } = await getNavList();
this.navList = navList || []; this.navList = navList || [];
...@@ -107,53 +102,45 @@ export default defineComponent({ ...@@ -107,53 +102,45 @@ export default defineComponent({
}, },
watch: { watch: {
$route() { $route() {
const { name } = this.$route; const { meta, path } = this.$route;
if (name === "EvaluatIndicator") { const { VITE_SYSTEM_NAMR = "创新示范绩效评价" } = ENV_PARAMS;
this.proceedActiveList = [ const routHistroy = [];
{ meta.person &&
name: "创新示范绩效评价", routHistroy.push({
path: "/", path: meta.person.path,
}, label: meta.person.label,
{ });
name: "数据中心",
path: "/", this.curRouteHistoy = [
}, {
]; path: "/",
} else { label: VITE_SYSTEM_NAMR,
this.proceedActiveList = [ },
{ ...routHistroy,
name: "创新示范绩效评价", {
path: "/", path,
}, label: meta.label,
{ },
name: "数据中心", ];
path: "/",
},
{
name: "产品融合发展",
path: "/evaluatIndicator/industrial",
},
];
}
}, },
}, },
methods: { methods: {
navClick(item: {}, index: number) { navClick(item: {}, index: number) {
const { link, children = [] } = item; // const { link, children = [] } = item;
this.activeIndex = index; // this.activeIndex = index;
this.secondIndex = 0; // this.secondIndex = 0;
this.secodndList = children; // this.secodndList = children;
// this.$router.push(link);
this.$router.push(link);
}, },
secondHandle(item: {}, index: number) { secondHandle(item: {}, index: number) {
this.secondIndex = index; // this.secondIndex = index;
this.$router.push(item.link); // this.$router.push(item.link);
}, },
toPage(item) { toPage(item) {
this.$router.push(item.path) console.log("item-", item);
} this.$router.push(item.path);
},
}, },
}); });
</script> </script>
......
src/route/dataCenter.ts 0 → 100644
浏览文件 @ bc6a230d
/**
* 数据中心模块——路由
*/
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 deleted 100644 → 0
浏览文件 @ b6cf9c10
/**
* 评价体系模块——路由
*/
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
浏览文件 @ bc6a230d
import { createRouter, createWebHistory, createWebHashHistory } from "vue-router" import { createRouter, createWebHistory, createWebHashHistory } from "vue-router"
import evaluatIndicator from "./evaluatIndicator" import dataCenter from "./dataCenter"
import navigation from "./navigation"; import navigation from "./navigation";
import {
DataCenterRouter
} from "./dataCenter"
const routes: any[] = [ export const routes: any[] = [
...evaluatIndicator ...dataCenter,
{
path: "/:pathMatch(.*)*",
redirect: DataCenterRouter.DATA_MAP,
},
] ]
const router = createRouter({ const router = createRouter({
......
src/route/navigation.tsx
浏览文件 @ bc6a230d
...@@ -2,11 +2,12 @@ import {Router} from "vue-router" ...@@ -2,11 +2,12 @@ import {Router} from "vue-router"
export default (router: Router) => { export default (router: Router) => {
const token = localStorage.getItem("token") const token = localStorage.getItem("token")
// router.beforeEach((to, from, next) => { // router.beforeEach((to, from, next) => {
// if(!token) { // // if(!token) {
// to.path === "/login" ? next() : router.replace("/login"); // // to.path === "/login" ? next() : router.replace("/login");
// }else { // // }else {
// next() // // next()
// } // // }
// next()
// }) // })
return router return router
} }
\ No newline at end of file
src/views/dataCenter/index.vue 0 → 100644
浏览文件 @ bc6a230d
<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
浏览文件 @ bc6a230d
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
import { defineComponent } from "vue"; import { defineComponent } from "vue";
import MapTitle from "@/components/mapTitle/index.vue"; import MapTitle from "@/components/mapTitle/index.vue";
import { Aim } from "@element-plus/icons"; import { Aim } from "@element-plus/icons";
import {EvaluatIndicatorRouter} from "@/route/evaluatIndicator" import {DataCenterRouter} from "@/route/dataCenter"
export default defineComponent({ export default defineComponent({
components: { components: {
...@@ -77,7 +77,8 @@ export default defineComponent({ ...@@ -77,7 +77,8 @@ export default defineComponent({
setup() {}, setup() {},
methods: { methods: {
detailsHandle() { 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
浏览文件 @ bc6a230d
...@@ -95,8 +95,8 @@ ...@@ -95,8 +95,8 @@
import { defineComponent } from "vue"; import { defineComponent } from "vue";
import MapTitle from "@/components/mapTitle/index.vue"; import MapTitle from "@/components/mapTitle/index.vue";
import { import {
EvaluatIndicatorRouter DataCenterRouter
} from "@/route/evaluatIndicator" } from "@/route/dataCenter"
export default defineComponent({ export default defineComponent({
components: { components: {
...@@ -105,7 +105,7 @@ export default defineComponent({ ...@@ -105,7 +105,7 @@ export default defineComponent({
setup() {}, setup() {},
methods: { methods: {
detailsHandle() { 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
浏览文件 @ bc6a230d
...@@ -4,13 +4,13 @@ import request from "../../../../axios/index" ...@@ -4,13 +4,13 @@ import request from "../../../../axios/index"
// 获取地图数据JOSN格式 // 获取地图数据JOSN格式
export async function getMapGeoData() { export async function getMapGeoData() {
return request({ return request({
url: '../../../../../public/mocks/evaluatIndicator/mapGeoData.json', url: '../../../../../public/mocks/dataCenter/mapGeoData.json',
}) })
} }
// 获取地图标记点 // 获取地图标记点
export async function getMapPointList() { export async function getMapPointList() {
return request({ return request({
url: '../../../../../public/mocks/evaluatIndicator/mapPointList.json', url: '../../../../../public/mocks/dataCenter/mapPointList.json',
}) })
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论