Merge remote-tracking branch 'origin/dev' into dev

src/assets/css/common.scss

@@ -127,10 +127,10 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .layout-container {
-  background-color: #030f2f;
+  background-color: #11214e;
   min-height: 100vh;
-  background-image: url("/src/assets/images/public/bg.jpg");
-  background-repeat: no-repeat;
+  //background-image: url("/src/assets/images/public/bg.jpg");
+  //background-repeat: no-repeat;
 }
 
 a {

src/assets/css/element.scss

@@ -6,7 +6,7 @@
   --el-text-color-regular: #fff !important;
   --el-fill-color-light: #0e1d44 !important; //hover背景色
   --el-color-check: #14affe !important; //hover、选中 文字颜色
-  --el-aside-bg-color: #081e42 !important;
+  --el-aside-bg-color: #1d3065 !important;
   --el-input-bg-color: #081435 !important;
   --el-fill-color-blank: #081435 !important; // 背景色
   --el-border-color-lighter: var(--el-border-color) !important;
@@ -91,7 +91,7 @@
 .el-menu-item {
   &:hover, &.is-active {
     //background: #1d3f77;
-    background-image: linear-gradient(to right, #1e499a, rgba(0, 0, 0, 0));
+    background-image: linear-gradient(to right, #2c6ee9, rgba(0, 0, 0, 0));
   }
 }
 

src/views/index/components/waybill.vue

@@ -1,6 +1,6 @@
 <template>
   <el-card style="margin-top: 10px">
-    <div class="title">双重预防运行情况统计</div>
+    <div class="title">运单情况统计</div>
     <el-table :data="data.tableData" style="width: 100%" size="small">
       <el-table-column prop="date" label="序号" />
       <el-table-column prop="date" label="运单编号" />