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

src/service/index.js

@@ -45,6 +45,19 @@ export const alarmDataApi = () =>
         prefixUrl: 'api2',
     })
 
+// export const page6echarts01 = (data) =>
+//     callApi({
+//         url: 'event/statisVillage',
+//         data,
+//         prefixUrl: 'api2',
+//     })
+
+// export const page6numerical = () =>
+//     callApi({
+//         url: 'event/statis',
+//         prefixUrl: 'api2',
+//     })
+
 // 树种
 export const page2echarts01 = (data) =>
     callApi({
@@ -60,11 +73,7 @@ export const page2echarts01 = (data) =>
 //         prefixUrl: 'api2',
 //     })
 
-// export const page6numerical = () =>
-//     callApi({
-//         url: 'event/statis',
-//         prefixUrl: 'api2',
-//     })
+
 
 
 

src/views/index.vue

@@ -208,7 +208,65 @@
         page5Char1:{},
         page5Char2:{},
         page6numerical:[],
-        page6Char1:{},
+        page6Char1:{
+          title: {
+            show:true,
+            text: '事件统计(件)',
+            textStyle:{
+              color: '#02EEFF',
+            }
+          },
+          tooltip: {
+            trigger: 'axis'
+          },
+          legend: {
+            data: ['火灾', '乱砍乱伐','病虫害'],
+            textStyle:{
+                color: '#fff',
+            }
+          },
+          calculable: true,
+          xAxis: [
+            {
+              type: 'category',
+              data: ['马鞍村', '三盘村', '灵家村', '龙子田'],
+              axisLabel: {
+                color: "rgba(255, 255, 255, 1)"
+              }
+            }
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              axisLabel: {
+                color: "rgba(255, 255, 255, 1)"
+              }
+            }
+          ],
+          series: [
+            {
+              name: '火灾',
+              type: 'bar',
+              data: [
+                2.0, 4.9, 7.0, 23.2
+              ]
+            },
+            {
+              name: '乱砍乱伐',
+              type: 'bar',
+              data: [
+                2.6, 5.9, 9.0, 26.4
+              ]
+            },
+            {
+              name: '病虫害',
+              type: 'bar',
+              data: [
+                2.6, 1.5, 10, 3
+              ]
+            }
+          ]
+        },
         xiaobaninput:'',
 
         
@@ -398,6 +456,18 @@
         page6echarts01().then(res=>{
           // console.log('res',res);
           this.page6Char1 = res.data;
+
+          // this.page6Char1.xAxis[0] = [];
+          // this.page6Char1.series[0].data = [];
+          // this.page6Char1.series[1].data = [];
+          // this.page6Char1.series[2].data = [];
+          // res.data&&res.data.forEach(element=>{
+          //   this.page6Char1.xAxis[0].push(element.villageName);
+          //   this.page6Char1.series[0].data.push(element.fireCount);
+          //   this.page6Char1.series[1].data.push(element.cutCount);
+          //   this.page6Char1.series[2].data.push(element.pestCount);
+          // })
+
           let charUuid = this.$refs.page6Char1.mid;
           this.$refs.page6Char1.intChar(charUuid)
         }).catch(err=>{