Browse Source

修改了首页样式

duanxiaoduan 1 year ago
parent
commit
e74cc999ad
2 changed files with 10 additions and 10 deletions
  1. 2 2
      .env.development
  2. 8 8
      src/views/dashboard/editor/index.vue

+ 2 - 2
.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/'
 

+ 8 - 8
src/views/dashboard/editor/index.vue

@@ -85,7 +85,7 @@
       </el-col>
     </el-row>
 
-    <el-row :gutter="5" style="height:300px;color: #fff;">
+    <el-row :gutter="5" style="height:300px;color: #fff;margin-top: -10px;">
       <el-col :span="24">
         <div style="height:300px;">
           <div class="Title">费用统计</div>
@@ -632,7 +632,7 @@ export default {
       var option = {
         title: { text: '', textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
-        color: ['#1890FF','#F14863','#FFC432','#4CF0A7'],
+        color: ['#1890FF','#4CF0A7','#FFC432','#F14863'],
         grid: { left: '3%', right: '13%', top: '15%', bottom: '4%', containLabel: true },
         legend: {
           data: ['迄今预算', '今年实际', '去年同期实际', '单头牛实际'], textStyle: { color: '#fff' }
@@ -706,7 +706,7 @@ export default {
       var option = {
         title: { text: '', textStyle: { color: '#769cfc' }},
         tooltip: { trigger: 'axis' },
-        color: ['#1890FF','#F14863','#4CF0A7'],
+        color: ['#1890FF','#4CF0A7','#F14863'],
         grid: { left: '3%', right: '13%', top: '15%', bottom: '4%', containLabel: true },
         legend: {
           data: ['设备指标迄今预算', '设备指标迄今实际', '完成率'], textStyle: { color: '#fff'}
@@ -855,7 +855,7 @@ export default {
           y: 10,
           textStyle: { color: '#fff', fontSize: '10' }
         },
-        color: ['#1890FF','#F14863','#FFC432','#4CF0A7'],
+        color:['#1890FF','#4CF0A7','#FFC432','#F14863'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', name: '时间', nameTextStyle: { padding: [0, 0, -20, -30] }, data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
         yAxis: [{ type: 'value', name: '百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }},splitLine: {
@@ -915,7 +915,7 @@ export default {
           y: 10,
           textStyle: { color: '#fff', fontSize: '10' }
         },
-        color: ['#1890FF','#F14863','#FFC432','#4CF0A7'],
+        color: ['#1890FF','#4CF0A7','#FFC432','#F14863'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', name: '时间', nameTextStyle: { padding: [0, 0, -20, -30] }, data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
         yAxis: [{ type: 'value', name: '百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }},splitLine: {
@@ -975,7 +975,7 @@ export default {
           y: 10,
           textStyle: { color: '#fff', fontSize: '10' }
         },
-        color: ['#1890FF','#F14863','#FFC432','#4CF0A7'],
+        color: ['#1890FF','#4CF0A7','#FFC432','#F14863'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', name: '时间', nameTextStyle: { padding: [0, 0, -20, -30] }, data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
         yAxis: [{ type: 'value', name: '百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }},splitLine: {
@@ -1035,7 +1035,7 @@ export default {
           y: 10,
           textStyle: { color: '#fff', fontSize: '10' }
         },
-        color: ['#1890FF','#F14863','#FFC432','#4CF0A7'],
+        color: ['#1890FF','#4CF0A7','#FFC432','#F14863'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', name: '时间', nameTextStyle: { padding: [0, 0, -20, -30] }, data: chart_data1.data1, axisLabel: { interval: 0 }, axisLine: { lineStyle: { color: '#fff' }}}],
         yAxis: [{ type: 'value', name: '百万', axisLabel: { formatter: '{value}' }, axisLine: { lineStyle: { color: '#fff', width: 1 }},splitLine: {
@@ -1086,7 +1086,7 @@ export default {
     .date{width: 100%;text-align: right;font-size: 14px;line-height: 60px;padding-right: 20px;}
     .Indexbutton{
       height: 20px;position: relative;width: 100%;
-      a{display: inline-block;height: 20px;line-height: 20px;font-size:10px;text-align: center;background: #769cfc;color: #fff;border-radius: 2px;width: 55px;position: absolute;left: 0;right: 0;top: 5px;bottom: 0;margin: 0 auto;}
+      a{display: inline-block;height: 20px;line-height: 20px;font-size:10px;text-align: center;background: #769cfc;color: #fff;border-radius: 2px;width: 55px;position: absolute;left: 0;right: 0;top: 0;bottom: 0;margin: 0 auto;}
     }
     .IndexTable{
       padding: 0 10px;