Bladeren bron

大屏主界面基本完成

seamew 3 jaren geleden
bovenliggende
commit
2cebbfee71
1 gewijzigde bestanden met toevoegingen van 9 en 21 verwijderingen
  1. 9 21
      src/views/newmain.vue

+ 9 - 21
src/views/newmain.vue

@@ -1,22 +1,14 @@
 <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="item3"><item3></item3></div>
-    <div class="item4">Item 4</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="item3"><item3></item3></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="item5"><item5></item5></div>
+    <div class="item6"><item6></item6></div>
+    <div class="item7"><item7></item7></div>
     <div class="item8"><coal-proportion></coal-proportion></div>
     <div class="span-col-2 span-row-2 item9">
       <div class="watch watch1"></div>
@@ -26,12 +18,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,11 +32,10 @@ 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"
-import equipment from "@/components/newMain/item10"
+import excavation from "@/components/newMain/item4";
+import coalPosition from "@/components/newMain/item11";
+import coalProportion from "@/components/newMain/item8";
+import equipment from "@/components/newMain/item10";
 
 export default {
   name: "newMain",