前端

fuintAdmin/src/views/indexcomponents/bottomindex.vue

@@ -14,7 +14,7 @@
         </div>
       </div>
       <div><span>{{ goodsRadio }}交易金额总计：</span><span class="title-lan">{{ goodsSum }}</span> <span>元</span></div>
-      <div v-loading="goodsLoading" id="charts" style="width: 100%; height: 400px;"></div>
+      <div v-loading="goodsLoading" id="charts" style="width: 100%; height: 400px;background: linear-gradient( 360deg, #E7F1F8 0%, #FFFFFF 100%);"></div>
     </div>
 
 
@@ -32,7 +32,7 @@
         </div>
       </div>
       <div><span>{{ cardRadio }}交易金额总计：</span><span class="title-lan">{{ cardSum }}</span> <span>元</span></div>
-      <div v-loading="cardLoading" id="chartx" style="width: 100%; height: 400px;"></div>
+      <div v-loading="cardLoading" id="chartx" style="width: 100%; height: 400px;background: linear-gradient( 360deg, #E7F1F8 0%, #FFFFFF 100%);"></div>
     </div>
 
   </div>
@@ -257,19 +257,7 @@ export default {
             lineStyle: {
               width: 4
             },
-            areaStyle: {
+
-              opacity: 0.8,
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                {
-                  offset: 0,
-                  color: '#fff'
-                },
-                {
-                  offset: 1,
-                  color: '#409EFF'
-                }
-              ])
-            },
           },
           {
             data: this.fuelDate,
@@ -277,19 +265,7 @@ export default {
             lineStyle: {
               width: 4
             },
-            areaStyle: {
+
-              opacity: 0.8,
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                {
-                  offset: 0,
-                  color: '#fff'
-                },
-                {
-                  offset: 1,
-                  color: '#86E1BB'
-                }
-              ])
-            },
           },
           // {
           //   data: [120, 220, 214, 118, 235, 227, 110],

fuintAdmin/src/views/indexcomponents/centenrindex.vue

@@ -15,7 +15,7 @@
       </div>
 
       <div><span>{{radio}}交易金额总计：</span><span class="title-lan">{{sum}}</span> <span>元</span></div>
-      <div v-loading="oilLoading" id="ccccc" style="width: 100%; height: 400px;"></div>
+      <div v-loading="oilLoading" id="ccccc" style="width: 100%; height: 400px; background: linear-gradient( 360deg, #F8F1E7 0%, #FFFFFF 100%); "></div>
     </div>
 
 
@@ -190,19 +190,7 @@ export default {
             lineStyle: {
               width: 4
             },
-            areaStyle: {
+
-              opacity: 0.8,
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                {
-                  offset: 0,
-                  color: '#fff'
-                },
-                {
-                  offset: 1,
-                  color: '#F8F1E7'
-                }
-              ])
-            },
 
           },
 

fuintAdmin/src/views/indexcomponents/indexcomponents.vue

@@ -51,6 +51,9 @@ export default {
 </script>
 
 <style scoped>
+#chart{
+  background: #F8F1E7;
+}
   .center{
     width: 100%;
     display: flex;
@@ -59,6 +62,7 @@ export default {
   }
   .left-box{
     width: 75%;
+
   }
   .right-box{
     width: 20%;

fuintBackend/fuint-application/src/main/java/com/fuint/common/config/AutoInjectBaseFieldInterceptor.java

@@ -42,6 +42,7 @@ public class AutoInjectBaseFieldInterceptor implements Interceptor {
         List<String> createUserList = new ArrayList<>();
         createUserList.add("updateUser");
         createUserList.add("updateBy");
+
         return createUserList;
     }
 

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -223,9 +223,7 @@
           <el-button class="center-left-lv" :disabled="(oilAmount + goodsAmount)==0" @click="settlement">立即结算</el-button>
         </div>
       </div>
-
     </div>
-
 <!--    油品选择-->
     <div class="center-right">
       <div class="center-top">
@@ -4807,13 +4805,14 @@
   .wrap-box{
     width: 31%;
     background: #ffffff;
-    border-radius: 8px;
+    border-radius: 10px;
-    height: 80px;
+    height: 40px;
     display: flex;
     align-items: center;
     justify-content: center;
     margin-bottom: 10px;
     cursor: pointer;
+    border: 1px solid #30a1ff;
 
   }
   .wrap-box2{
@@ -4915,9 +4914,9 @@
   .center-left-lv{
     width: 60%;
     height: 80px;
-    background-color: #13ce66;
+    background: linear-gradient( 312deg, #FF945B 0%, #FEB37C 100%);
     color: white;
-    border-radius: 50px;
+    border-radius: 10px;
     display: flex;
     align-items: center;
     justify-content: center;

fuintCashierWeb/src/views/cashier/index.vue

@@ -768,11 +768,11 @@ export default {
     box-shadow: 0 4px 4px 4px rgba(0,21,41,.08);
     box-sizing: border-box;
     padding: 10px;
-
   }
   .app-left-title{
-    color: #53a0ff;
+    color: #ff9655;
     font-weight: bold;
+    font-size: 18px;
   }
   .app-left-top{
     height: 60px;

fuintCashierWeb/src/views/login/index.vue

@@ -2,12 +2,7 @@
   <div class="login">
     <div class="box-center">
       <div class="box-left">
-        <div class="bai-size">百业兴智慧加油站收银台</div>
+
-        <div class="bact-box">
-          <div class="sanhh">活动营销</div>
-          <div class="sanhh">节省人力</div>
-          <div class="sanhh">精准定位</div>
-        </div>
       </div>
       <div class="box-right">
         <div class="box-title">
@@ -320,7 +315,7 @@ $light_gray: #eee;
   height: 100vh;
   width: 100%;
   position: relative;
-  background-image: url("../../assets/images/backbbj.png");
+  background-image: url("../../assets/images/loin-back.png");
   //background-image: url("../assets/images/backbbj.png");
   overflow: hidden;
   background-size: cover;
@@ -350,7 +345,7 @@ $light_gray: #eee;
   width: 50%;
   height: 100%;
   background: #00aaff;
-  background-image: url("../../assets/images/box-left.png");
+  background-image: url("../../assets/images/left-img.png");
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center;