Merge branch 'master' of http://172.16.90.201:3000/castgroup_forest/castgroup_bigscreen

src/service/index.js

@@ -19,6 +19,7 @@ export const alarmDataApi = () =>
         url: 'event/latest',
         prefixUrl: 'api2',
     })
+
 // 查询省市县
 export const searchApi = (data) =>
     callApi({
@@ -26,6 +27,16 @@ export const searchApi = (data) =>
         data,
         prefixUrl: 'api2',
     })
+
+
+// 事件信息
+export const page2echarts01 = (data) =>
+    callApi({
+        url: 'smallClass/treeComp',
+        data,
+        prefixUrl: 'api2',
+    })
+
 // export const page6numerical = () =>
 //     callApi({
 //         url: 'event/statis',

src/views/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @LastEditors: wangcc
+ * @LastEditors: gcz
 -->
 <template>
   <div class=''>
@@ -16,8 +16,8 @@
 
     <section class="left-wrap " v-if="page==1">
       <Numerical class="blur-wrap" :data="page1numerical" />
-      <MyEcharts class="blur-wrap u-p-t" mid="page1Char1" ref="page1Char1" :option="page1Char1" height="30vh" />
-      <MyEcharts class="blur-wrap u-m-t u-p-t" mid="page1Char2" ref="page1Char2" :option="page1Char2" height="30vh" />
+      <MyEcharts class="blur-wrap u-p-t" mid="page1Char1" ref="page1Char1" :option="page1Char1" height="30vh" style="padding-left:20px" />
+      <MyEcharts class="blur-wrap u-m-t u-p-t" mid="page1Char2" ref="page1Char2" :option="page1Char2" height="30vh" style="padding-left:20px" />
     </section>
 
     <section class="left-wrap " v-if="page==2">