+
- {{numberOfTanks}}
+ {{numberOfTanks}}
油罐数量
-
-
{{inventoryVolume}}
+
+ {{inventoryVolume}}
盘点升数
- {{stockDifference}}
+ {{stockDifference}}
库存差异(L)
- {{profitLossAmount}}
+ {{profitLossAmount}}
盈亏总额(元)
@@ -869,14 +869,16 @@ export default {
}
.box {
height: 100%;
- width: 50%;
+ width: 212px;
margin-right: 10px;
- background-color: rgba(204, 204, 204, 0.3);
+ background: #FFFFFF;
+ border-radius: 10px 10px 10px 10px;
+ border: 1px solid #EEEEEE;
border-radius: 10px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
- text-align: center;
+
}
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
index 08f519ba3..29f3fd3a8 100644
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -140,11 +140,10 @@
现金
-

+
-
@@ -534,9 +533,7 @@ export default {
align-items: center;
}
.box{
- //box-sizing: border-box;
padding: 5px;
- //background: #f9f9f9;
margin-right: 20px;
padding-left: 20px;
@@ -607,7 +604,7 @@ export default {
}
.icon-img{
- //margin-left: 110px;
+
width: 100%;
height: 20px;
margin-right: 5px;
diff --git a/fuintAdmin_zt/src/assets/menu_icon/apple.png b/fuintAdmin_zt/src/assets/menu_icon/apple.png
new file mode 100644
index 000000000..e7e8a084f
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/apple.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/apple_b.png b/fuintAdmin_zt/src/assets/menu_icon/apple_b.png
new file mode 100644
index 000000000..b1c2dfa91
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/apple_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/caiwu.png b/fuintAdmin_zt/src/assets/menu_icon/caiwu.png
new file mode 100644
index 000000000..804977436
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/caiwu.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/caiwu1.png b/fuintAdmin_zt/src/assets/menu_icon/caiwu1.png
new file mode 100644
index 000000000..b5f86162b
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/caiwu1.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/caiwu1_b.png b/fuintAdmin_zt/src/assets/menu_icon/caiwu1_b.png
new file mode 100644
index 000000000..2fc08130e
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/caiwu1_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/caiwu_b.png b/fuintAdmin_zt/src/assets/menu_icon/caiwu_b.png
new file mode 100644
index 000000000..550db1cb0
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/caiwu_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/car.png b/fuintAdmin_zt/src/assets/menu_icon/car.png
new file mode 100644
index 000000000..7f928304f
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/car.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/car_b.png b/fuintAdmin_zt/src/assets/menu_icon/car_b.png
new file mode 100644
index 000000000..4d4f05000
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/car_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/code.png b/fuintAdmin_zt/src/assets/menu_icon/code.png
new file mode 100644
index 000000000..cdc2de988
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/code.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/code_b.png b/fuintAdmin_zt/src/assets/menu_icon/code_b.png
new file mode 100644
index 000000000..15fcc0ccc
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/code_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/home.png b/fuintAdmin_zt/src/assets/menu_icon/home.png
new file mode 100644
index 000000000..05c82aed2
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/home.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/home_b.png b/fuintAdmin_zt/src/assets/menu_icon/home_b.png
new file mode 100644
index 000000000..d9b1129bf
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/home_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/home_c.png b/fuintAdmin_zt/src/assets/menu_icon/home_c.png
new file mode 100644
index 000000000..ec4947f70
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/home_c.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/jigou.png b/fuintAdmin_zt/src/assets/menu_icon/jigou.png
new file mode 100644
index 000000000..07ca13edb
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/jigou.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/jigou_b.png b/fuintAdmin_zt/src/assets/menu_icon/jigou_b.png
new file mode 100644
index 000000000..ac4602062
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/jigou_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/laba.png b/fuintAdmin_zt/src/assets/menu_icon/laba.png
new file mode 100644
index 000000000..8066dd3ff
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/laba.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/laba_b.png b/fuintAdmin_zt/src/assets/menu_icon/laba_b.png
new file mode 100644
index 000000000..b450235f3
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/laba_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/lihe.png b/fuintAdmin_zt/src/assets/menu_icon/lihe.png
new file mode 100644
index 000000000..7757d1f6d
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/lihe.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/lihe_b.png b/fuintAdmin_zt/src/assets/menu_icon/lihe_b.png
new file mode 100644
index 000000000..ff2304b6b
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/lihe_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/ren.png b/fuintAdmin_zt/src/assets/menu_icon/ren.png
new file mode 100644
index 000000000..874cf8b3e
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/ren.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/ren_b.png b/fuintAdmin_zt/src/assets/menu_icon/ren_b.png
new file mode 100644
index 000000000..82b579f75
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/ren_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/setting.png b/fuintAdmin_zt/src/assets/menu_icon/setting.png
new file mode 100644
index 000000000..c9e056e6e
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/setting.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/setting_b.png b/fuintAdmin_zt/src/assets/menu_icon/setting_b.png
new file mode 100644
index 000000000..a02975f75
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/setting_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/shouye.png b/fuintAdmin_zt/src/assets/menu_icon/shouye.png
new file mode 100644
index 000000000..71ba3820b
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/shouye.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/shouye_b.png b/fuintAdmin_zt/src/assets/menu_icon/shouye_b.png
new file mode 100644
index 000000000..5ea49fbd2
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/shouye_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/user.png b/fuintAdmin_zt/src/assets/menu_icon/user.png
new file mode 100644
index 000000000..381342f8e
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/user.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/user_b.png b/fuintAdmin_zt/src/assets/menu_icon/user_b.png
new file mode 100644
index 000000000..c6ac0da95
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/user_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/wendang.png b/fuintAdmin_zt/src/assets/menu_icon/wendang.png
new file mode 100644
index 000000000..3d140da9a
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/wendang.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/wendang_b.png b/fuintAdmin_zt/src/assets/menu_icon/wendang_b.png
new file mode 100644
index 000000000..95ea90667
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/wendang_b.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/youqiang.png b/fuintAdmin_zt/src/assets/menu_icon/youqiang.png
new file mode 100644
index 000000000..27d70ab98
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/youqiang.png differ
diff --git a/fuintAdmin_zt/src/assets/menu_icon/youqiang_b.png b/fuintAdmin_zt/src/assets/menu_icon/youqiang_b.png
new file mode 100644
index 000000000..6d23c71c4
Binary files /dev/null and b/fuintAdmin_zt/src/assets/menu_icon/youqiang_b.png differ
diff --git a/fuintAdmin_zt/src/assets/styles/btn.scss b/fuintAdmin_zt/src/assets/styles/btn.scss
index e6ba1a8e1..92326cc14 100644
--- a/fuintAdmin_zt/src/assets/styles/btn.scss
+++ b/fuintAdmin_zt/src/assets/styles/btn.scss
@@ -97,3 +97,21 @@
font-size: 14px;
border-radius: 4px;
}
+
+.el-button--warning{
+ color: white !important;
+ background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important;
+ border: 0px !important;
+}
+.el-button--primary{
+ color: white !important;
+ background: linear-gradient( 90deg, #FF8646 0%, #FFA360 100%) !important;
+ border: 0px !important;
+}
+.el-button--success{
+ background: linear-gradient( 90deg, #0DC291 0%, #0DC291 100%) !important;
+ border: 0px !important;
+}
+.el-button--text{
+ color: #FF9655 !important;
+}
diff --git a/fuintAdmin_zt/src/assets/styles/sidebar.scss b/fuintAdmin_zt/src/assets/styles/sidebar.scss
index f827d32ee..8b8b3c604 100644
--- a/fuintAdmin_zt/src/assets/styles/sidebar.scss
+++ b/fuintAdmin_zt/src/assets/styles/sidebar.scss
@@ -81,13 +81,21 @@
// menu hover
.submenu-title-noDropdown,
.el-submenu__title {
+ height: var(--sidebar-height);
&:hover {
background-color: rgba(0, 0, 0, 0.06) !important;
}
}
& .theme-dark .is-active > .el-submenu__title {
- color: $base-menu-color-active !important;
+ color: white !important;
+ background: linear-gradient( 229deg, #FF8646 0%, #FFA360 100%) !important;
+ //border-top-left-radius: 8px !important; /* 左上圆角 */
+ //border-top-right-radius: 8px !important; /* 右上圆角 */
+ border-radius: 8px;
+ i {
+ color: #fff !important;
+ }
}
& .nest-menu .el-submenu>.el-submenu__title,
@@ -107,15 +115,22 @@
background-color: $base-sub-menu-hover !important;
}
}
+
+ .el-menu-item.is-active {
+ color: #FF9655 !important;
+ //菜单点击上的背景颜色
+ background: linear-gradient( 229deg, #FFEFE5 0%, #FFEFE5 100%) !important;
+ }
+
}
.hideSidebar {
.sidebar-container {
- width: 54px !important;
+ width: 70px !important;
}
.main-container {
- margin-left: 54px;
+ margin-left: 70px;
}
.submenu-title-noDropdown {
@@ -147,8 +162,8 @@
.el-submenu {
&>.el-submenu__title {
&>span {
- height: 0;
- width: 0;
+ height: 60px;
+ width: 70px;
overflow: hidden;
visibility: hidden;
display: inline-block;
@@ -199,11 +214,19 @@
}
}
+ .el-menu-item.is-active {
+ color: white !important;
+ //菜单点击上的背景颜色
+ background: linear-gradient( 229deg, #FF9655 0%, #FF9655 100%) !important;
+ }
+
.nest-menu .el-submenu>.el-submenu__title,
.el-menu-item {
+ background-color: #FFFAF6 !important;
&:hover {
// you can use $subMenuHover
- background-color: rgba(0, 0, 0, 0.06) !important;
+ color: #FFA46B !important;
+ background-color: #FFEBDD !important;
}
}
diff --git a/fuintAdmin_zt/src/assets/styles/variables.scss b/fuintAdmin_zt/src/assets/styles/variables.scss
index b5c86673e..994dc33ee 100644
--- a/fuintAdmin_zt/src/assets/styles/variables.scss
+++ b/fuintAdmin_zt/src/assets/styles/variables.scss
@@ -9,7 +9,7 @@ $yellow:#FEC171;
$panGreen: #30B08F;
// 默认菜单主题风格
-$base-menu-color:#FF9655;// 菜单全部字体颜色
+$base-menu-color:#727171;// 菜单全部字体颜色
$base-menu-color-active:#FF9655;// 父级菜单激活的字体颜色
$base-menu-background:#fff;
$base-logo-title-color: #FF9655;
@@ -18,8 +18,8 @@ $base-menu-light-color:#ffffff;
$base-menu-light-background:#ffffff;
$base-logo-light-title-color: #FF9655;
-$base-sub-menu-background: #f8f8f8;//展开的背景色
-$base-sub-menu-hover: #adadad;
+$base-sub-menu-background: #FFFAF6;//展开的背景色
+$base-sub-menu-hover: #FFEFE5;
$base-sidebar-width: 200px;
diff --git a/fuintAdmin_zt/src/components/Hamburger/index.vue b/fuintAdmin_zt/src/components/Hamburger/index.vue
index 368b00215..058bb1403 100644
--- a/fuintAdmin_zt/src/components/Hamburger/index.vue
+++ b/fuintAdmin_zt/src/components/Hamburger/index.vue
@@ -1,14 +1,21 @@
-
diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
index c497ab674..f1fe76bb9 100644
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@@ -1,6 +1,6 @@
-
+
@@ -104,8 +104,8 @@ export default {
.navbar {
height: 90px;
overflow: hidden;
- position: relative;
- background: #FF9655;
+ //position: relative;
+ background: white;
//background-image: url("../../assets/images/kkx.png") ;
background-size: 100% 100%;
background-size: cover;
@@ -114,7 +114,6 @@ export default {
box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-sizing: border-box;
padding-top:25px ;
- position: relative;
.hamburger-container {
line-height: 46px;
height: 100%;
@@ -122,17 +121,18 @@ export default {
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color:transparent;
+ margin-left: 10px;
&:hover {
background: rgba(0, 0, 0, .025)
}
}
.title-logo{
- position: absolute;
- top: 50%; /* 将元素垂直向上移动容器高度的50% */
- left: 50%; /* 将元素水平向左移动容器宽度的50% */
- transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
- color: #ffffff;
+ //position: absolute;
+ //top: 50%; /* 将元素垂直向上移动容器高度的50% */
+ //left: 5%; /* 将元素水平向左移动容器宽度的50% */
+ //transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
+ //color: #ffffff;
font-size: 24px;
font-weight: bold;
display: flex;
@@ -167,7 +167,6 @@ export default {
padding: 0 8px;
height: 100%;
font-size: 18px;
- color: #ffffff;
vertical-align: text-bottom;
&.hover-effect {
diff --git a/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue b/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue
index 20d78d211..433a930ef 100644
--- a/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue
+++ b/fuintAdmin_zt/src/layout/components/Sidebar/Logo.vue
@@ -3,7 +3,10 @@