重新修改冲突

src/router/index.js

@@ -531,7 +531,7 @@ const router = new Router({
           path: "/main",
           name: "主界面",
           id: 111,
-          component: () => import("../views/newMain.vue"),
+          component: () => import("../views/newmain.vue"),
           hidden: false,
         },
         {

src/views/newmain.vue

@@ -1,23 +1,13 @@
 <template>
   <div class="grid">
     <div class="item1"><item1></item1></div>
-    <!-- <div class="span-col-2 span-row-3 item2"><Main></Main></div> -->
-    <div class="span-col-2 span-row-3 item2">item2</div>
+    <div class="span-col-2 span-row-3 item2"><Main></Main></div>
     <div class="item3"><item3></item3></div>
-    <div class="item4">Item 4</div>
+    <div class="item4"><excavation></excavation></div>
     <div class="item5"><item5></item5></div>
     <div class="item6"><item6></item6></div>
     <div class="item7"><item7></item7></div>
-    <div class="item8">Item 8</div>
-    <div class="span-col-2 span-row-3 item2"><Main></Main></div>
-    <!-- <div class="span-col-2 span-row-3 item2">item2</div> -->
-    <div class="item3">Item 3</div>
-    <!-- 掘进进尺 -->
-    <div class="item4"><excavation></excavation></div>
-    <div class="item5">Item 5</div>
-    <div class="item6">Item 6</div>
-    <div class="item7">Item 7</div>
-    <div class="item8"><coal-proportion></coal-proportion></div>
+    <div class="item8"><coal-proportion></coal-proportion></div>    
     <div class="span-col-2 span-row-2 item9">
       <div class="watch watch1"></div>
       <div class="watch watch2"></div>
@@ -26,12 +16,9 @@
       <div class="watch watch5"></div>
       <div class="watch watch6"></div>
     </div>
-    <div class="item10">Item 10</div>
-    <div class="item11">Item 11</div>
-    <div class="item12"><item12></item12></div>
     <div class="item10"><equipment></equipment></div>
     <div class="item11"><coal-position></coal-position></div>
-    <div class="item12">Item 12</div>
+    <div class="item12"><item12></item12></div>
   </div>
 </template>
 
@@ -43,7 +30,6 @@ import item5 from "@/components/newMain/item5";
 import item7 from "@/components/newMain/item7";
 import item3 from "@/components/newMain/item3";
 import item12 from "@/components/newMain/item12";
-import item1 from "@/components/newMain/item1"
 import excavation from "@/components/newMain/item4"
 import coalPosition from "@/components/newMain/item11"
 import coalProportion from "@/components/newMain/item8"
@@ -76,7 +62,7 @@ export default {
       rgba(0, 0, 0, 0.25) 200%
     );
   width: 100%;
-  height: 890px;
+  height: 100vh;
   display: grid;
   grid-template-columns: repeat(4, 1fr);
   grid-template-rows: repeat(5, 1fr);