fix: 解决冲突
This commit is contained in:
parent
f27eaafe3d
commit
8ab9a1d352
@ -123,6 +123,11 @@ export const staticRouter: RouteRecordRaw[] = [
|
||||
name: "基坑监测",
|
||||
component: () => import("@/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/index.vue")
|
||||
},
|
||||
{
|
||||
path: "/tunnelPosition",
|
||||
name: "隧道定位监测",
|
||||
component: () => import("@/views/sevenLargeScreen/safetyManagement/tunnelPosition/index.vue")
|
||||
},
|
||||
{
|
||||
path: "/highFormwork",
|
||||
name: "高支模监测",
|
||||
@ -138,11 +143,6 @@ export const staticRouter: RouteRecordRaw[] = [
|
||||
name: "烟感监测",
|
||||
component: () => import("@/views/sevenLargeScreen/safetyManagement/smokeSensor/index.vue")
|
||||
},
|
||||
{
|
||||
path: "/tunnelPosition",
|
||||
name: "隧道定位监测",
|
||||
component: () => import("@/views/sevenLargeScreen/safetyManagement/tunnelPosition/index.vue")
|
||||
}
|
||||
],
|
||||
meta: {
|
||||
title: "七参数大屏"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<ScaleBox :width="1920" :height="1080" bgc="transparent" :delay="100" :isFlat="false">
|
||||
<div class="largeScreen" ref="dataScreenRef">
|
||||
<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">
|
||||
<p>数字化项目监管平台</p>
|
||||
</span>
|
||||
@ -144,6 +144,10 @@ let menuList = ref([
|
||||
companyPath: "/foundationPitMonitor",
|
||||
menuName: "基坑监测"
|
||||
},
|
||||
{
|
||||
menuName: "隧道定位监测",
|
||||
companyPath: "/tunnelPosition"
|
||||
},
|
||||
{
|
||||
menuName: "临边防护",
|
||||
companyPath: "/edgeProtection"
|
||||
@ -533,15 +537,14 @@ function jumpBgd() {
|
||||
.loginOut:hover {
|
||||
background-color: #2758c0;
|
||||
}
|
||||
.hearderIcon{
|
||||
left: 1%;
|
||||
top: 1%;
|
||||
height: 5%;
|
||||
width: 12%;
|
||||
position: absolute;
|
||||
img{
|
||||
width: 100%;
|
||||
}
|
||||
.hearderIcon {
|
||||
left: 1%;
|
||||
top: 1%;
|
||||
height: 5%;
|
||||
width: 12%;
|
||||
position: absolute;
|
||||
img {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user