From 4a12039789fe99ffcf63f3fcf4d7acd3c8091c0e Mon Sep 17 00:00:00 2001
From: duanliang <duanliang>
Date: Wed, 18 Dec 2024 11:07:30 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E7=9B=91=E6=8E=A7=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E3=80=81=E5=AE=89=E5=85=A8=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/box-3.vue    |  5 +----
 src/views/home/index.vue               | 23 -----------------------
 src/views/monitor/components/box-3.vue |  8 ++++----
 src/views/monitor/index.vue            | 25 +++++--------------------
 4 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/src/views/home/components/box-3.vue b/src/views/home/components/box-3.vue
index a0fd8cd..af706af 100644
--- a/src/views/home/components/box-3.vue
+++ b/src/views/home/components/box-3.vue
@@ -287,8 +287,5 @@
       }
     }
   }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> 1108aafed493fffba8fdd2e63eae89a9092ef6e5
+
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index a915696..33af4e9 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,33 +1,10 @@
 <template>
-<<<<<<< HEAD
-  <main class="wrapper">
-    <box1 />
-    <div class="header">
-      <ul class="nav-left">
-        <li class="nav-left-item">安全</li>
-        <li class="nav-left-item">景区</li>
-        <li class="nav-left-item">交通</li>
-      </ul>
-      <div class="title">奉节县旅游指挥调度中心</div>
-      <ul class="nav-right">
-        <li class="nav-right-item">停车</li>
-        <li class="nav-right-item">工单</li>
-        <li class="nav-right-item">舆情</li>
-        <li class="nav-right-item">酒店</li>
-      </ul>
-    </div>
-    <box2 />
-    <box3 />
-    <box4 />
-  </main>
-=======
   <Header title="奉节县旅游指挥调度中心" is-skip :nav-left="navLeft" :nav-right="navRight" />
   <CoreVideo />
   <box2 />
   <box3 />
   <box4 />
   <Correspondence />
->>>>>>> 1108aafed493fffba8fdd2e63eae89a9092ef6e5
 </template>
 
 <script setup>
diff --git a/src/views/monitor/components/box-3.vue b/src/views/monitor/components/box-3.vue
index 2f0c8fc..a1fc40c 100644
--- a/src/views/monitor/components/box-3.vue
+++ b/src/views/monitor/components/box-3.vue
@@ -87,8 +87,8 @@
 </script>
 <style lang="scss" scoped>
 	.box-3-content{
-		width:vw(2353);
-		height:vh(964);
+		width:vw(2410);
+		height:vh(965);
 		// background-image: url('/src/assets/images/monotir-bg-1.png');
 		background-size: 100% 100%;
 		margin-top: vh(120);
@@ -103,7 +103,7 @@
 			.video-live{
 				justify-content: space-between;
 				.video-lt{
-					width:vw(1655);
+					width:vw(1700);
 					height:vh(950);
 					background-image: url('/src/assets/images/one-video-bg.png');
 					background-size: 100% 100%;
@@ -161,7 +161,7 @@
 				}
 			}
 			.v-item{
-				width:vw(400);
+				width:vw(420);
 				height:vh(300);
 				background-image: url('/src/assets/images/v-item-bg.png');
 				background-size: 100% 100%;
diff --git a/src/views/monitor/index.vue b/src/views/monitor/index.vue
index 2f55ad1..5ed24be 100644
--- a/src/views/monitor/index.vue
+++ b/src/views/monitor/index.vue
@@ -1,34 +1,19 @@
 <template>
   <main class="wrapper">
-    <box1 />
+    <CoreVideo />
 	<box2 />
 	<box3 />
-    <div class="header">
-      <ul class="nav-left">
-        <li class="nav-left-item">奉节县</li>
-        <li class="nav-left-item">三峡之巅</li>
-        <li class="nav-left-item">白帝城</li>
-		<li class="nav-left-item">龙河桥</li>
-      </ul>
-      <div class="title">监控大屏</div>
-      <ul class="nav-right">
-        <li class="nav-right-item">路段1</li>
-        <li class="nav-right-item">路段</li>
-        <li class="nav-right-item">路段</li>
-        <li class="nav-right-item">路段</li>
-      </ul>
-    </div>
-    <box4 />
+	<Header title="监控大屏" is-skip :nav-left="navLeft" :nav-right="navRight" />
+    <Correspondence />
   </main>
 </template>
 
 <script setup>
-  import box1 from './components/box-1.vue'
-  import box4 from './components/box-4.vue'
   import box3 from './components/box-3.vue'
   import box2 from './components/box-2.vue'
   import box5 from './components/box-5.vue'
-
+  const navLeft = [{ name: '奉节县' }, { name: '三峡之巅', path: '/scenic' }, { name: '白帝城' },{ name: '龙河桥' }]
+  const navRight = [{ name: '路段' }, { name: '路段' }, { name: '路段' }, { name: '路段' }]
   onMounted(() => {})
 </script>