更改了维修用量分析及水用量分析

.env.development

@@ -6,9 +6,9 @@ ENV = 'development'
 # 线上正式地址
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
+# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 线上测试
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 

src/views/report/queryRepair/index.vue

@@ -379,23 +379,23 @@ export default {
         title: { text: '各牧场年度柴油量对比', textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['今年用量', '去年同期'],
+          data: ['实际用量', '预算'],
           right: 40
         },
-        color: ['#2dc0e8', '#769cfc'],
+        color: ['#61A5E8', '#9933FF'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category',  name: '牧场',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value', name: '升', axisLabel: { formatter: '{value}万' }}],
+        yAxis: [{ type: 'value', name: '元', axisLabel: { formatter: '{value}万' }}],
         series: [
           {
-            name: '今年用量',
+            name: '实际用量',
             type: 'bar',
             data: chart_data.data1,
             barMaxWidth:20,
             emphasis: { label: { show: true, position: 'inside' }}
           },
           {
-            name: '去年同期',
+            name: '预算',
             type: 'bar',
             barMaxWidth:20,
             data: chart_data.data2,
@@ -426,10 +426,10 @@ export default {
           data: ['实际费用','预算', '去年同期'],
           right: 40
         },
-        color: ['#2dc0e8', '#769cfc', '#FFB800'],
+        color: ['#61A5E8', '#7ECF51', '#9933FF'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category',  name: '牧场',data: chart_data.xdata, axisLabel: { interval: 0, rotate: 30 }}],
-        yAxis: [{ type: 'value', name: '价格(元)'}],
+        yAxis: [{ type: 'value', name: '费用(元)'}],
         series: [
           {
             name: '实际费用',
@@ -437,7 +437,12 @@ export default {
             data: chart_data.data1,
             emphasis: { label: { show: true, position: 'inside' }},
             barMaxWidth:20,
-            markLine:{ data:[ {yAxis:20} ] }
+            markLine:{
+              data:[ {yAxis:20}],
+              lineStyle: {
+                color: '#FFB800'
+              },
+            }
           },
           {
             name: '预算',

src/views/report/queryWater/index.vue

@@ -406,7 +406,7 @@ export default {
             markLine:{
               data:[ {yAxis:20} ],
               lineStyle: {
-                  color: '#FFB800'
+                color: '#FFB800'
               }
             }
           },