Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

# Conflicts:
#	fuintAdmin_zt/src/layout/components/Navbar.vue

fuintAdmin_zt/src/layout/components/Navbar.vue

@@ -210,7 +210,6 @@ export default {
             console.log('error submit!!');
             return false;
           }
-
       })
 
 

fuintAdmin_zt/src/views/homeComponents/agent.vue

@@ -517,8 +517,10 @@ export default {
           }
         },
 
+
         legend: {
-          data: ['交易金额', '交易笔数', '活跃油站数']
+          data: ['交易金额', '交易笔数', '活跃油站数'],
+          left: 'right'
         },
         xAxis: [
           {
@@ -729,6 +731,8 @@ export default {
   height: 100%;
   box-sizing: border-box;
   padding: 15px;
+  height: 808px;
+  overflow: auto;
 }
 .san-box{
   width: 360px;

fuintAdmin_zt/src/views/setting/banner/index.vue

@@ -113,7 +113,7 @@
 
     </el-card>
 
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
       <el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">
         <el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
           <el-form-item label="banner名称" prop="bannerName">
@@ -133,7 +133,7 @@
                 v-if="this.deviceInfo.productImage"
                 :src="imagePath + this.deviceInfo.productImage"
                 class="list-img"
-                style="width: 100%; height: 100%"
+                style="width: 750px; height: 100%"
               />
               <i v-if="!this.deviceInfo.productImage" class="el-icon-plus"></i>
             </el-upload>
@@ -164,8 +164,6 @@
           <el-form-item label="备注" prop="note">
             <el-input v-model="deviceInfo.note" style="width: 300px" ></el-input>
           </el-form-item>
-
-
           <el-form-item>
             <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
           </el-form-item>