fix: 解决冲突

This commit is contained in:
cjp 2023-09-20 09:37:06 +08:00
parent f27eaafe3d
commit 8ab9a1d352
2 changed files with 19 additions and 16 deletions

View File

@ -123,6 +123,11 @@ export const staticRouter: RouteRecordRaw[] = [
name: "基坑监测", name: "基坑监测",
component: () => import("@/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/index.vue") component: () => import("@/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/index.vue")
}, },
{
path: "/tunnelPosition",
name: "隧道定位监测",
component: () => import("@/views/sevenLargeScreen/safetyManagement/tunnelPosition/index.vue")
},
{ {
path: "/highFormwork", path: "/highFormwork",
name: "高支模监测", name: "高支模监测",
@ -138,11 +143,6 @@ export const staticRouter: RouteRecordRaw[] = [
name: "烟感监测", name: "烟感监测",
component: () => import("@/views/sevenLargeScreen/safetyManagement/smokeSensor/index.vue") component: () => import("@/views/sevenLargeScreen/safetyManagement/smokeSensor/index.vue")
}, },
{
path: "/tunnelPosition",
name: "隧道定位监测",
component: () => import("@/views/sevenLargeScreen/safetyManagement/tunnelPosition/index.vue")
}
], ],
meta: { meta: {
title: "七参数大屏" title: "七参数大屏"

View File

@ -2,7 +2,7 @@
<ScaleBox :width="1920" :height="1080" bgc="transparent" :delay="100" :isFlat="false"> <ScaleBox :width="1920" :height="1080" bgc="transparent" :delay="100" :isFlat="false">
<div class="largeScreen" ref="dataScreenRef"> <div class="largeScreen" ref="dataScreenRef">
<div class="header"> <div class="header">
<div class="hearderIcon"><img src="@/assets/images/headerLeftIcon.png" alt=""></div> <div class="hearderIcon"><img src="@/assets/images/headerLeftIcon.png" alt="" /></div>
<span class="projectTitle"> <span class="projectTitle">
<p>数字化项目监管平台</p> <p>数字化项目监管平台</p>
</span> </span>
@ -144,6 +144,10 @@ let menuList = ref([
companyPath: "/foundationPitMonitor", companyPath: "/foundationPitMonitor",
menuName: "基坑监测" menuName: "基坑监测"
}, },
{
menuName: "隧道定位监测",
companyPath: "/tunnelPosition"
},
{ {
menuName: "临边防护", menuName: "临边防护",
companyPath: "/edgeProtection" companyPath: "/edgeProtection"
@ -533,15 +537,14 @@ function jumpBgd() {
.loginOut:hover { .loginOut:hover {
background-color: #2758c0; background-color: #2758c0;
} }
.hearderIcon{ .hearderIcon {
left: 1%; left: 1%;
top: 1%; top: 1%;
height: 5%; height: 5%;
width: 12%; width: 12%;
position: absolute; position: absolute;
img{ img {
width: 100%; width: 100%;
} }
} }
</style> </style>