Browse Source

修改了报表

duanxiaoduan 1 year ago
parent
commit
730b0f65a2

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 3 - 3
src/views/report/queryElec/index.vue

@@ -8,7 +8,7 @@
 
     <el-row v-if="isChart1" style="position: relative;">
       <p style="position: absolute;top:-12px;left:40%;color:rgb(130, 165, 252);background:rgb(230, 243, 255);border:1px solid rgb(130, 165, 252);padding:10px;border-radius:10px">
-        集团用电量:{{ total }}
+        集团用电量:{{ total }}度
       </p>
        <el-radio-group v-model="radio1" class="group" @change="changeGroup">
           <el-radio :label="'集团'">集团</el-radio>
@@ -863,8 +863,8 @@ export default {
         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: '' }},
-          { type: 'value', name: '', axisLabel: { formatter: '{value}%' }}
+          { type: 'value', name: '费用(元)', axisLabel: { formatter: '{value}' }},
+          { type: 'value', name: '', axisLabel: { formatter: '{value}%' },splitLine:{show: false}}
         ],
         series: [
           { name: '实际费用', type: 'bar', data: chart_data.data1, barMaxWidth:20, emphasis: { label: { show: true, position: 'inside' }} },

+ 1 - 1
src/views/report/queryRepair/index.vue

@@ -826,7 +826,7 @@ export default {
           left: 40,
           bottom:0
         },
-        // color: ['#2dc0e8', '#769cfc', '#FFB800'],
+        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: '费用(元)'}],

+ 7 - 7
src/views/report/queryWater/index.vue

@@ -8,7 +8,7 @@
 
     <el-row v-if="isChart1" style="position: relative;">
       <p style="position: absolute;top:-12px;left:40%;color:rgb(130, 165, 252);background:rgb(230, 243, 255);border:1px solid rgb(130, 165, 252);padding:10px;border-radius:10px">
-        集团用水量:{{ total }}
+        集团用水量:{{ total }}吨
       </p>
        <el-radio-group v-model="radio1" class="group" @change="changeGroup">
           <el-radio :label="'集团'">集团</el-radio>
@@ -436,8 +436,8 @@ export default {
         // this.chart_data6 = response.data.chart_data
         if(response.data){
           this.chart_data6 = {
-            data1:response.data.chart_data.lastYear,
-            data2:response.data.chart_data.nowYear,
+            data1:response.data.chart_data.nowYear,
+            // data2:response.data.chart_data.nowYear,
             xdata:response.data.chart_data.months,
             data_name:response.data.chart_data.pastureName
           }
@@ -571,7 +571,7 @@ export default {
         title: { text: '单头牛水量', left:'center',textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
         legend: {
-          data: ['实际用', '去年同期'],
+          data: ['实际用', '去年同期'],
           right: 40
         },
         color:  ['#61A5E8', '#9933FF','#FFB800'],
@@ -580,7 +580,7 @@ export default {
         yAxis: [{ type: 'value', name: '用量(吨)'}],
         series: [
           {
-            name: '实际用',
+            name: '实际用',
             type: 'bar',
             data: chart_data.data1,
             emphasis: { label: { show: true, position: 'inside' }},
@@ -857,8 +857,8 @@ export default {
         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: '' }},
-          { type: 'value', name: '', axisLabel: { formatter: '{value}%' }}
+          { type: 'value', name: '费用(元)', axisLabel: { formatter: '{value}' }},
+          { type: 'value', name: '', axisLabel: { formatter: '{value}%' },splitLine:{show: false}}
         ],
         series: [
           { name: '实际费用', type: 'bar', data: chart_data.data1, barMaxWidth:20, emphasis: { label: { show: true, position: 'inside' }} },

Some files were not shown because too many files changed in this diff