wang_xy 2 лет назад
Родитель
Сommit
99b35c6ee6

+ 50 - 32
src/views/bigdata/bigdata.vue

@@ -72,14 +72,14 @@
           <!--</div>-->
           <!--&lt;!&ndash;<chartKeyArea></chartKeyArea>&ndash;&gt;-->
         <!--</div>-->
-        <div class="b-con mg-b-20">
-          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>森林资源年统计</span>
-            <!--<span>矿臧资源</span>-->
-          </div>
-          <chartPitG2></chartPitG2>
-          <!--<chartAncientTree></chartAncientTree>-->
-        </div>
+        <!--<div class="b-con mg-b-20">-->
+          <!--<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">-->
+            <!--<span>森林资源年统计</span>-->
+            <!--&lt;!&ndash;<span>矿臧资源</span>&ndash;&gt;-->
+          <!--</div>-->
+          <!--<chartPitG2></chartPitG2>-->
+          <!--&lt;!&ndash;<chartAncientTree></chartAncientTree>&ndash;&gt;-->
+        <!--</div>-->
         <div class="b-con">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>事件趋势</span>
@@ -87,21 +87,39 @@
           <chartEventTrend></chartEventTrend>
           <strong></strong>
         </div>
-      </div>
-      <!-- 第四纵向-->
-      <div class="bigdata-list wid-li-3 m-l-15 flex-r">
-        <div class="b-con mg-b-20 tall">
+        <div class="b-con mg-b-20 b-49">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>土地资源管理信息</span>
+          </div>
+          <chartFireBrigade></chartFireBrigade>
+        </div>
+        <div class="b-con mg-b-20 b-49">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>网格分布</span>
           </div>
           <chartGridDistribution></chartGridDistribution>
         </div>
+      </div>
+      <!-- 第四纵向-->
+      <div class="bigdata-list wid-li-3 m-l-15 flex-r">
+        <!--<div class="b-con mg-b-20 tall">-->
+          <!--<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">-->
+            <!--<span>网格分布</span>-->
+          <!--</div>-->
+          <!--<chartGridDistribution></chartGridDistribution>-->
+        <!--</div>-->
         <!--<div class="b-con">-->
           <!--<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">-->
             <!--<span>天气趋势</span>-->
           <!--</div>-->
           <!--<chartWeatherTrends></chartWeatherTrends>-->
         <!--</div>-->
+        <div class="b-con mg-b-20 tall">
+          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
+            <span>网格人员</span>
+          </div>
+          <chartGridStaff></chartGridStaff>
+        </div>
         <div class="b-con mg-b-20 b-49">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
             <span>地质灾害易发区</span>
@@ -118,26 +136,26 @@
         </div>
       </div>
       <!-- 第五纵向-->
-      <div class="bigdata-list wid-li-3 m-l-15 flex-r">
-        <div class="b-con mg-b-20 tall">
-          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>网格人员</span>
-          </div>
-          <chartGridStaff></chartGridStaff>
-        </div>
-        <div class="b-con mg-b-20 b-49">
-          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>土地资源管理信息</span>
-          </div>
-          <chartFireBrigade></chartFireBrigade>
-        </div>
-        <div class="b-con mg-b-20 b-49">
-          <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>水能资源</span>
-          </div>
-          <chartWeatherStation></chartWeatherStation>
-        </div>
-      </div>
+      <!--<div class="bigdata-list wid-li-3 m-l-15 flex-r">-->
+        <!--<div class="b-con mg-b-20 tall">-->
+          <!--<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">-->
+            <!--<span>网格人员</span>-->
+          <!--</div>-->
+          <!--<chartGridStaff></chartGridStaff>-->
+        <!--</div>-->
+        <!--&lt;!&ndash;<div class="b-con mg-b-20 b-49">&ndash;&gt;-->
+          <!--&lt;!&ndash;<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">&ndash;&gt;-->
+            <!--&lt;!&ndash;<span>土地资源管理信息</span>&ndash;&gt;-->
+          <!--&lt;!&ndash;</div>&ndash;&gt;-->
+          <!--&lt;!&ndash;<chartFireBrigade></chartFireBrigade>&ndash;&gt;-->
+        <!--&lt;!&ndash;</div>&ndash;&gt;-->
+        <!--&lt;!&ndash;<div class="b-con mg-b-20 b-49">&ndash;&gt;-->
+          <!--&lt;!&ndash;<div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">&ndash;&gt;-->
+            <!--&lt;!&ndash;<span>水能资源</span>&ndash;&gt;-->
+          <!--&lt;!&ndash;</div>&ndash;&gt;-->
+          <!--&lt;!&ndash;<chartWeatherStation></chartWeatherStation>&ndash;&gt;-->
+        <!--&lt;!&ndash;</div>&ndash;&gt;-->
+      <!--</div>-->
       <!-- 第六纵向-->
       <div class="bigdata-list wid-li-1 m-l-15">
         <div class="b-con mg-b-20 taller">

+ 1 - 1
src/views/bigdata/chart-gridDistribution.vue

@@ -1,7 +1,7 @@
 <!-- **************************************NO.10 收集点*************************************** -->
 <template>
   <div class="chart-container">
-    <div id="collection" style="width: 100%; height:50vh;">
+    <div id="collection" style="width: 100%; height:23vh;">
     </div>
   </div>
 </template>

+ 1 - 1
src/views/bigdata/tabbar.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bigdata-map-tabbar">
     <el-row :gutter="20">
-      <el-col :span="4" v-for="(regionNum,index) in regionNum" :key="index">
+      <el-col :span="5" v-for="(regionNum,index) in regionNum" :key="index">
         <div class="list-content">
           <span>{{regionNum.value}}</span>
           <h5>{{regionNum.name}}</h5>