diff --git a/fuintAdmin/src/views/indexcomponents/centenrindex.vue b/fuintAdmin/src/views/indexcomponents/centenrindex.vue index 4306d9301..544432b12 100644 --- a/fuintAdmin/src/views/indexcomponents/centenrindex.vue +++ b/fuintAdmin/src/views/indexcomponents/centenrindex.vue @@ -15,7 +15,7 @@
{{radio}}交易金额总计:{{sum}}
-
+
@@ -194,7 +194,14 @@ export default { }, - ] + ], + grid: { + left: '8%', + right: '8%', + bottom: '5%', + containLabel: true + }, + }; chart.setOption(option) diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 98cb7a5ef..f87ab4808 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -243,16 +243,17 @@
-
{{ getName(oilNameList,getOilNames(oilNumberList,item.numberId)) }}
+
{{ getName(oilNameList,getOilNames(oilNumberList,item.numberId)) }}
{{item.gunName}}
-
+
- {{ item.tankName }} + {{ item.tankName }}
@@ -268,7 +269,7 @@
-
重置
+
重置
@@ -1497,11 +1498,10 @@ leftindex:0, oilList:[], colorList:[ - {color:'#e5f0ff'}, - {color:'#fff2e5'}, - {color:'#e5edf1'}, - {color:'#ecfae5'}, - {color:'#fafafa'} + {color:'#e5f0ff',border:"#409EFF"}, + {color:'#fff2e5',border:"#FF9655"}, + {color:'#ecfae5',border:"#0DC291"}, + {color:'#fff8e7',border:"#FFB519"} ], restaurants:'', num: 1, @@ -4829,19 +4829,19 @@ //cursor: pointer; //color: #20b400; } - .wrap-box :hover{ - /*background: #00afff !important;*/ - width: 100%; - height: 100%; - border-radius: 8px; - height: 80px; - display: flex; - align-items: center; - justify-content: center; - border: 1px solid #00afff; - cursor: pointer; - /*color: white;*/ - } + //.wrap-box :hover{ + // /*background: #00afff !important;*/ + // width: 100%; + // height: 100%; + // border-radius: 8px; + // height: 80px; + // display: flex; + // align-items: center; + // justify-content: center; + // border: 1px solid #00afff; + // cursor: pointer; + // /*color: white;*/ + //} .box-center{ width: 100%; @@ -4864,27 +4864,27 @@ .bottom-qk{ border: 1px solid #99a9bf; box-sizing: border-box; - padding: 14px 20px; - border-radius: 50px; + padding: 10px 20px; + border-radius: 10px; color: #99a9bf; margin: 15px 0px ; } .bottom-qd{ border: 1px solid #13ce66; - background: #13ce66; + background: linear-gradient( 312deg, #9CDCA0 0%, #5BC557 100%); box-sizing: border-box; padding: 14px 20px; - border-radius: 50px; + border-radius: 8px; color: #ffffff; margin: 15px 10px ; } .bottom-gd{ - border: 1px solid #FF9655; - background: #FF9655; + border: 1px solid #02AAFE; + background: linear-gradient( 312deg, #70CAFD 0%, #0BADFE 100%, #02AAFE 100%); box-sizing: border-box; padding: 14px 20px; - border-radius: 50px; + border-radius: 8px; color: #ffffff; margin: 15px 10px ;