Explorar el Código

1.修改了水量分析页面

duanxiaoduan hace 1 año
padre
commit
e2b05c9a86
Se han modificado 1 ficheros con 13 adiciones y 23 borrados
  1. 13 23
      src/views/report/queryWater/index.vue

+ 13 - 23
src/views/report/queryWater/index.vue

@@ -34,12 +34,12 @@
     </el-row>
 
     <el-row style="position: relative;">
-       <el-radio-group v-model="radio3" class="group" @change="changeGroup('3')">
+      <!-- <el-radio-group v-model="radio3" class="group" @change="changeGroup('3')">
           <el-radio :label="1">集团</el-radio>
           <el-radio :label="2">一中心</el-radio>
           <el-radio :label="3">二中心</el-radio>
           <el-radio :label="4">三中心</el-radio>
-        </el-radio-group>
+        </el-radio-group> -->
       <el-col :span="24">
         <div id="chart3" style="width: 100%;height:400px;" />
       </el-col>
@@ -345,7 +345,7 @@ export default {
         title: { text: '各牧场年度用水量对比', textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['今年用量', '迄今预算'],
+          data: ['今年用量', '去年同期'],
           right: 40
         },
         color: ['#61A5E8', '#9933FF'],
@@ -361,7 +361,7 @@ export default {
             emphasis: { label: { show: true, position: 'inside' }}
           },
           {
-            name: '迄今预算',
+            name: '去年同期',
             type: 'bar',
             barMaxWidth:20,
             data: chart_data.data2,
@@ -392,7 +392,7 @@ export default {
           data: ['实际费用', '去年同期'],
           right: 40
         },
-        color: ['#2dc0e8', '#769cfc'],
+        color:  ['#61A5E8', '#9933FF','#FFB800'],
         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: '价格(元)'}],
@@ -403,7 +403,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: '去年同期',
@@ -434,10 +439,10 @@ export default {
         title: { text: '单头牛水费', left:'center',textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['实际费用', '预算','去年同期'],
+          data: ['实际费用'],
           right: 40
         },
-        color: ['#2dc0e8', '#769cfc', '#FFB800'],
+        color: ['#61A5E8'],
         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: '价格(元)'}],
@@ -447,23 +452,8 @@ export default {
             type: 'bar',
             data: chart_data.data1,
             emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20,
-            markLine:{ data:[ {yAxis:20} ] }
-          },
-          {
-            name: '预算',
-            type: 'bar',
-            data: chart_data.data2,
-            emphasis: { label: { show: true, position: 'inside' }},
             barMaxWidth:20
           },
-          {
-            name: '去年同期',
-            type: 'bar',
-            data: chart_data.data3,
-            emphasis: { label: { show: true, position: 'inside' }},
-            barMaxWidth:20
-          }
 
         ]
       }